From 842d8d9921961e068422a46bc758e7acda01f478 Mon Sep 17 00:00:00 2001
From: MikeIsAStar <99037623+MikeIsAStar@users.noreply.github.com>
Date: Wed, 13 Dec 2023 16:15:00 -0500
Subject: [PATCH] QR2: Do not forward malicious messages to clients

---
 qr2/message.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/qr2/message.go b/qr2/message.go
index 81e4357..3ca3dd6 100644
--- a/qr2/message.go
+++ b/qr2/message.go
@@ -76,7 +76,13 @@ func SendClientMessage(senderIP string, destSearchID uint64, message []byte) {
 		senderProfileID := binary.LittleEndian.Uint32(message[0x10:0x14])
 		moduleName = "QR2/MSG:p" + strconv.FormatUint(uint64(senderProfileID), 10)
 
-		if (int(message[9]) + 0x14) != len(message) {
+		dataSize := message[9]
+		if dataSize > 0x80 {
+			logging.Error(moduleName, "Received malicious match command packet header")
+			return
+		}
+
+		if (int(dataSize) + 0x14) != len(message) {
 			logging.Error(moduleName, "Received invalid match command packet header")
 			return
 		}