GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 22:35:37 +03:00
Code Issues Projects Releases Wiki Activity

Fix missing new line on client console message which is not truncated server-side if its length exceeds buffer size (bug 3140, r=arkshine)

Browse Source 
Former-commit-id: 6373b0238d
This commit is contained in:
DynamicBits 2013-08-24 00:58:23 +02:00
parent de818ab5ec
commit 7f0c820566
1 changed files with 80 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
amxmodx/amxmodx.cpp
View File

@ -211,43 +211,70 @@ static cell AMX_NATIVE_CALL console_cmd(AMX *amx, cell *params) /* 2 param */
return len; return len;
} }
// The server console is limited to 255 bytes, including the newline.
// The client console is limited to 127 bytes, including the newline.
static cell AMX_NATIVE_CALL console_print(AMX *amx, cell *params) /* 2 param */ static cell AMX_NATIVE_CALL console_print(AMX *amx, cell *params) /* 2 param */
{ {
int index = params[1]; int index = params[1];
if (index < 1 || index > gpGlobals->maxClients) if (index < 1 || index > gpGlobals->maxClients)
{
g_langMngr.SetDefLang(LANG_SERVER); g_langMngr.SetDefLang(LANG_SERVER);
}
else else
{
g_langMngr.SetDefLang(index); g_langMngr.SetDefLang(index);
}
int len; int len;
char* message = format_amxstring(amx, params, 2, len); char* message = format_amxstring(amx, params, 2, len);
if (index < 1 || index > gpGlobals->maxClients) // Server console
{
if (len > 254) if (len > 254)
{
len = 254; len = 254;
if (((message[len - 1] & 0xFF) >= 0xC2) && ((message[len - 1] & 0xFF) <= 0xEF)) { // Don't truncate a double-byte character
len--;
}
}
message[len++] = '\n'; message[len++] = '\n';
message[len] = 0; message[len] = 0;
if (index < 1 || index > gpGlobals->maxClients)
SERVER_PRINT(message); SERVER_PRINT(message);
else }
else // A specific player's console
{ {
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->ingame) if (pPlayer->ingame)
{
if (len > 126) // Client console truncates after byte 127. (126 + \n = 127)
{
len = 126;
if (((message[len - 1] & 0xFF) >= 0xC2) && ((message[len - 1] & 0xFF) <= 0xEF)) // Don't truncate a double-byte character
{
len--;
}
}
message[len++] = '\n'; // Client expects newline from the server
message[len] = 0;
UTIL_ClientPrint(pPlayer->pEdict, 2, message); UTIL_ClientPrint(pPlayer->pEdict, 2, message);
} }
}
return len; return len;
} }
// print_notify and print_console are limited to 127 bytes, including the newline.
// print_chat and print_center are not limited by *this* function.
static cell AMX_NATIVE_CALL client_print(AMX *amx, cell *params) /* 3 param */ static cell AMX_NATIVE_CALL client_print(AMX *amx, cell *params) /* 3 param */
{ {
int len = 0; int len = 0;
char *msg; char *msg;
if (params[1] == 0) if (params[1] == 0) // 0 = All players
{ {
for (int i = 1; i <= gpGlobals->maxClients; ++i) for (int i = 1; i <= gpGlobals->maxClients; ++i)
{ {
@ -257,12 +284,25 @@ static cell AMX_NATIVE_CALL client_print(AMX *amx, cell *params) /* 3 param */
{ {
g_langMngr.SetDefLang(i); g_langMngr.SetDefLang(i);
msg = format_amxstring(amx, params, 3, len); msg = format_amxstring(amx, params, 3, len);
msg[len++] = '\n';
// params[2]: print_notify = 1, print_console = 2, print_chat = 3, print_center = 4
if (((params[2] == 1) || (params[2] == 2)) && (len > 126)) // Client console truncates after byte 127. (126 + \n = 127)
{
len = 126;
if (((msg[len - 1] & 0xFF) >= 0xC2) && ((msg[len - 1] & 0xFF) <= 0xEF)) // Don't truncate a double-byte character
{
len--;
}
}
msg[len++] = '\n'; // Client expects newline from the server
msg[len] = 0; msg[len] = 0;
UTIL_ClientPrint(pPlayer->pEdict, params[2], msg); UTIL_ClientPrint(pPlayer->pEdict, params[2], msg);
} }
} }
} else { }
else // A specific player
{
int index = params[1]; int index = params[1];
if (index < 1 || index > gpGlobals->maxClients) if (index < 1 || index > gpGlobals->maxClients)
@ -272,14 +312,27 @@ static cell AMX_NATIVE_CALL client_print(AMX *amx, cell *params) /* 3 param */
} }
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->ingame)
{
g_langMngr.SetDefLang(index); g_langMngr.SetDefLang(index);
msg = format_amxstring(amx, params, 3, len); msg = format_amxstring(amx, params, 3, len);
msg[len++] = '\n';
// params[2]: print_notify = 1, print_console = 2, print_chat = 3, print_center = 4
if (((params[2] == 1) || (params[2] == 2)) && (len > 126)) // Client console truncates after byte 127. (126 + \n = 127)
{
len = 126;
if (((msg[len - 1] & 0xFF) >= 0xC2) && ((msg[len - 1] & 0xFF) <= 0xEF)) // Don't truncate a double-byte character
{
len--;
}
}
msg[len++] = '\n'; // Client expects newline from the server
msg[len] = 0; msg[len] = 0;
if (pPlayer->ingame) UTIL_ClientPrint(pPlayer->pEdict, params[2], msg);
UTIL_ClientPrint(pPlayer->pEdict, params[2], msg); //format_amxstring(amx, params, 3, len)); }
} }
return len; return len;