Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust TextMsg/SayText maximum buffer length from 190 to 187 due to "%s" parameter added in #763

Browse Source
This commit is contained in:
Arkshine 2019-10-23 16:25:50 +02:00
parent 4a2aecfe85
commit be3f2f540b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
amxmodx/util.cpp
View File

@ -260,15 +260,15 @@ void UTIL_DHudMessage(edict_t *pEntity, const hudtextparms_t &textparms, const c
MESSAGE_END(); MESSAGE_END();
} }
/* warning - buffer of msg must be longer than 190 chars! /* warning - buffer of msg must be longer than 187 chars!
(here in AMX it is always longer) */ (here in AMX it is always longer) */
void UTIL_ClientPrint(edict_t *pEntity, int msg_dest, char *msg) void UTIL_ClientPrint(edict_t *pEntity, int msg_dest, char *msg)
{ {
if (!gmsgTextMsg) if (!gmsgTextMsg)
return; // :TODO: Maybe output a warning log? return; // :TODO: Maybe output a warning log?
char c = msg[190]; char c = msg[187];
msg[190] = 0; // truncate without checking with strlen() msg[187] = 0; // truncate without checking with strlen()
if (pEntity) if (pEntity)
MESSAGE_BEGIN(MSG_ONE, gmsgTextMsg, NULL, pEntity); MESSAGE_BEGIN(MSG_ONE, gmsgTextMsg, NULL, pEntity);
@ -279,7 +279,7 @@ void UTIL_ClientPrint(edict_t *pEntity, int msg_dest, char *msg)
WRITE_STRING("%s"); WRITE_STRING("%s");
WRITE_STRING(msg); WRITE_STRING(msg);
MESSAGE_END(); MESSAGE_END();
msg[190] = c; msg[187] = c;
} }
void UTIL_ClientSayText(edict_t *pEntity, int sender, char *msg) void UTIL_ClientSayText(edict_t *pEntity, int sender, char *msg)
@ -287,15 +287,15 @@ void UTIL_ClientSayText(edict_t *pEntity, int sender, char *msg)
if (!gmsgSayText) if (!gmsgSayText)
return; // :TODO: Maybe output a warning log? return; // :TODO: Maybe output a warning log?
char c = msg[190]; char c = msg[187];
msg[190] = 0; // truncate without checking with strlen() msg[187] = 0; // truncate without checking with strlen()
MESSAGE_BEGIN(MSG_ONE, gmsgSayText, NULL, pEntity); MESSAGE_BEGIN(MSG_ONE, gmsgSayText, NULL, pEntity);
WRITE_BYTE(sender); WRITE_BYTE(sender);
WRITE_STRING("%s"); WRITE_STRING("%s");
WRITE_STRING(msg); WRITE_STRING(msg);
MESSAGE_END(); MESSAGE_END();
msg[190] = c; msg[187] = c;
} }
void UTIL_TeamInfo(edict_t *pEntity, int playerIndex, const char *pszTeamName) void UTIL_TeamInfo(edict_t *pEntity, int playerIndex, const char *pszTeamName)