From 13778247990d60c2ad8aa5729bc0397ab764eaaa Mon Sep 17 00:00:00 2001
From: LJ Sonic <lamr@free.fr>
Date: Mon, 3 Jan 2022 22:37:19 +0100
Subject: [PATCH] Fix long chat messages causing net command failures
---
src/hu_stuff.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index fbd485b0a4..5f838b8948 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -634,7 +634,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
SINT8 target;
UINT8 flags;
const char *dispname;
- char *msg;
+ char msgbuf[HU_MAXMSGLEN + 1];
+ char *msg = msgbuf;
boolean action = false;
char *ptr;
INT32 spam_eatmsg = 0;
@@ -643,8 +644,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
target = READSINT8(*p);
flags = READUINT8(*p);
- msg = (char *)*p;
- SKIPSTRINGN(*p, HU_MAXMSGLEN);
+ READSTRINGN(*p, msgbuf, HU_MAXMSGLEN);
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
{
@@ -913,7 +913,11 @@ static void HU_sendChatMessage(void)
if (c >= ' ' && !(c & 0x80))
buf[ci] = c;
};
- buf[ci] = '\0';
+ if (ci-2 < HU_MAXMSGLEN)
+ {
+ buf[ci] = '\0';
+ ci++;
+ }
memset(w_chat, '\0', sizeof(w_chat));
c_input = 0;
@@ -981,7 +985,7 @@ static void HU_sendChatMessage(void)
{
buf[0] = teamtalk ? -1 : target; // target
buf[1] = 0; // flags
- SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1);
+ SendNetXCmd(XD_SAY, buf, ci);
}
}
--
GitLab