thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix long chat messages causing net command failures

Browse source
This commit is contained in:
LJ Sonic 2022-01-03 22:37:19 +01:00 • committed by toaster
parent 47c7351928
commit d3d2205932
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/hu_stuff.c
View file

@ -641,7 +641,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
SINT8 target; SINT8 target;
UINT8 flags; UINT8 flags;
const char *dispname; const char *dispname;
char *msg; char msgbuf[HU_MAXMSGLEN + 1];
char *msg = msgbuf;
boolean action = false; boolean action = false;
char *ptr; char *ptr;
INT32 spam_eatmsg = 0; INT32 spam_eatmsg = 0;
@ -650,8 +651,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
target = READSINT8(*p); target = READSINT8(*p);
flags = READUINT8(*p); flags = READUINT8(*p);
msg = (char *)*p; READSTRINGN(*p, msgbuf, HU_MAXMSGLEN);
SKIPSTRINGN(*p, HU_MAXMSGLEN);
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum))) if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
{ {
@ -995,7 +995,11 @@ static void HU_sendChatMessage(void)
if (c >= ' ' && !(c & 0x80)) if (c >= ' ' && !(c & 0x80))
buf[ci] = c; buf[ci] = c;
}; };
buf[ci] = '\0'; if (ci-2 < HU_MAXMSGLEN)
{
buf[ci] = '\0';
ci++;
}
memset(w_chat, '\0', sizeof(w_chat)); memset(w_chat, '\0', sizeof(w_chat));
c_input = 0; c_input = 0;
@ -1063,7 +1067,7 @@ static void HU_sendChatMessage(void)
{ {
buf[0] = teamtalk ? -1 : target; // target buf[0] = teamtalk ? -1 : target; // target
buf[1] = 0; // flags buf[1] = 0; // flags
SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1); SendNetXCmd(XD_SAY, buf, ci);
} }
} }