diff options
| author | tron <tron@openttd.org> | 2005-08-28 12:24:57 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-08-28 12:24:57 +0000 |
| commit | d975abc96c4eabd4a1053ee21f2b6951779a87c4 (patch) | |
| tree | dfedf7a20a1b1bef9337b90678b68de7ec35aa61 /network_client.c | |
| parent | 70c07d13beca606e76d61b546d864a8961578b98 (diff) | |
| download | openttd-d975abc96c4eabd4a1053ee21f2b6951779a87c4.tar.xz | |
(svn r2899) -Fix: Several format string vulnerabilities and buffer overflows in the network code
Diffstat (limited to 'network_client.c')
| -rw-r--r-- | network_client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/network_client.c b/network_client.c index b64e8358f..6da4b0618 100644 --- a/network_client.c +++ b/network_client.c @@ -349,7 +349,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO) if (ci != NULL) { if (playas == ci->client_playas && strcmp(name, ci->client_name) != 0) { // Client name changed, display the change - NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, name); + NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", name); } else if (playas != ci->client_playas) { // The player changed from client-player.. // Do not display that for now @@ -666,7 +666,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR_QUIT) ci = NetworkFindClientInfoFromIndex(index); if (ci != NULL) { - NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str); + NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str); // The client is gone, give the NetworkClientInfo free ci->client_index = NETWORK_EMPTY_INDEX; @@ -684,11 +684,11 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_QUIT) NetworkClientInfo *ci; index = NetworkRecv_uint16(MY_CLIENT, p); - NetworkRecv_string(MY_CLIENT, p, str, 100); + NetworkRecv_string(MY_CLIENT, p, str, lengthof(str)); ci = NetworkFindClientInfoFromIndex(index); if (ci != NULL) { - NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str); + NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str); // The client is gone, give the NetworkClientInfo free ci->client_index = NETWORK_EMPTY_INDEX; |