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

Merge branch 'fix-say-cmd' into 'master'

Browse source 
Fix chat message buffer handling

See merge request KartKrew/Kart!2400
This commit is contained in:
AJ Martinez 2024-05-21 00:30:31 +00:00
commit 4ee43d6e10
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_clisrv.c
View file

@ -4727,8 +4727,7 @@ static void PT_Say(int node)
{ {
size_t i; size_t i;
const size_t j = strlen(say.message); for (i = 0; i < sizeof say.message && say.message[i]; i++)
for (i = 0; i < j; i++)
{ {
if (say.message[i] & 0x80) if (say.message[i] & 0x80)
{ {

2
src/d_clisrv.h
View file

@ -395,7 +395,7 @@ struct resultsall_pak
struct say_pak struct say_pak
{ {
char message[HU_MAXMSGLEN + 1]; char message[HU_MAXMSGLEN];
UINT8 target; UINT8 target;
UINT8 flags; UINT8 flags;
UINT8 source; UINT8 source;

18
src/hu_stuff.c
View file

@ -544,8 +544,8 @@ void HU_AddChatText(const char *text, boolean playsound)
void DoSayCommand(char *message, SINT8 target, UINT8 flags, UINT8 source) void DoSayCommand(char *message, SINT8 target, UINT8 flags, UINT8 source)
{ {
char buf[2 + HU_MAXMSGLEN + 1]; char buf[3 + HU_MAXMSGLEN];
char *msg = &buf[3]; char *p = buf;
// Enforce shout for the dedicated server. // Enforce shout for the dedicated server.
if (dedicated && source == serverplayer && !(flags & HU_CSAY)) if (dedicated && source == serverplayer && !(flags & HU_CSAY))
@ -553,14 +553,12 @@ void DoSayCommand(char *message, SINT8 target, UINT8 flags, UINT8 source)
flags |= HU_SHOUT; flags |= HU_SHOUT;
} }
buf[0] = target; WRITESINT8(p, target);
buf[1] = flags; WRITEUINT8(p, flags);
buf[2] = source; WRITEUINT8(p, source);
msg[0] = '\0'; WRITESTRINGN(p, message, HU_MAXMSGLEN);
strcpy(msg, message); SendNetXCmd(XD_SAY, buf, p - buf);
SendNetXCmd(XD_SAY, buf, strlen(msg) + 1 + msg-buf);
} }
/** Send a message to everyone. /** Send a message to everyone.
@ -690,7 +688,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
flags = READUINT8(*p); flags = READUINT8(*p);
playernum = READUINT8(*p); playernum = READUINT8(*p);
msg = buf; msg = buf;
READSTRINGL(*p, msg, HU_MAXMSGLEN + 1); READSTRINGN(*p, msg, HU_MAXMSGLEN);
//check for invalid characters (0x80 or above) //check for invalid characters (0x80 or above)
{ {