NETstring: Fix when maxlen is 0

DARwins1 · Jun 27, 2024 · 59cab08 · 59cab08
1 parent 55216d0
commit 59cab08
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/netplay/nettypes.cpp b/lib/netplay/nettypes.cpp
@@ -901,18 +901,19 @@ void NETstring(char *str, uint16_t maxlen)
 	queueAuto(len);
 
 	// Truncate length if necessary
-	if (len > maxlen - 1)
+	uint16_t maxReadLen = (maxlen > 0) ? static_cast<uint16_t>(maxlen - 1) : 0;
+	if (len > maxReadLen)
 	{
 		debug(LOG_ERROR, "NETstring: %s packet, length %u truncated at %u", NETgetPacketDir() == PACKET_ENCODE ? "Encoding" : "Decoding", len, maxlen);
-		len = maxlen - 1;
+		len = maxReadLen;
 	}
 
 	for (unsigned i = 0; i < len; ++i)
 	{
 		queueAuto(str[i]);
 	}
 
-	if (NETgetPacketDir() == PACKET_DECODE)
+	if (NETgetPacketDir() == PACKET_DECODE && maxlen > 0)
 	{
 		// NUL-terminate
 		str[len] = '\0';