summaryrefslogtreecommitdiff
path: root/network_client.c
diff options
context:
space:
mode:
authorDarkvater <Darkvater@openttd.org>2006-10-21 23:31:34 +0000
committerDarkvater <Darkvater@openttd.org>2006-10-21 23:31:34 +0000
commit494c56475f04f0753d1ef7b8126612d3017df861 (patch)
treebbd2a7ac7e0c3b558bf638e1779108ced158cb6a /network_client.c
parentc15e699479ca81045db05af98ad86452b97572fd (diff)
downloadopenttd-494c56475f04f0753d1ef7b8126612d3017df861.tar.xz
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
The last parameter should point to the end of the buffer (eg lastof(buf)) Courtesy of Tron.
Diffstat (limited to 'network_client.c')
-rw-r--r--network_client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/network_client.c b/network_client.c
index 690429895..80dd45b94 100644
--- a/network_client.c
+++ b/network_client.c
@@ -628,7 +628,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT)
/* For speaking to player or give money, we need the player-name */
if (!IsValidPlayer(ci_to->client_playas)) return NETWORK_RECV_STATUS_OKAY; // This should never happen
- GetString(name, GetPlayer(ci_to->client_playas)->name_1);
+ GetString(name, GetPlayer(ci_to->client_playas)->name_1, lastof(name));
ci = NetworkFindClientInfoFromIndex(_network_own_client_index);
break;
default:
@@ -654,7 +654,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR_QUIT)
NetworkClientInfo *ci;
index = NetworkRecv_uint16(MY_CLIENT, p);
- GetNetworkErrorMsg(str, NetworkRecv_uint8(MY_CLIENT, p));
+ GetNetworkErrorMsg(str, NetworkRecv_uint8(MY_CLIENT, p), lastof(str));
ci = NetworkFindClientInfoFromIndex(index);
if (ci != NULL) {