gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22031) -Fix: bad servers could crash a client

Browse Source
This commit is contained in:
rubidium 2011-02-08 21:45:38 +00:00
parent 5f7439a00f
commit 537bd8a429
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/network_client.cpp
View File

@ -568,6 +568,13 @@ DEF_GAME_RECEIVE_COMMAND(Client, PACKET_SERVER_CLIENT_INFO)
return NETWORK_RECV_STATUS_OKAY; return NETWORK_RECV_STATUS_OKAY;
} }
/* There are at most as many ClientInfo as ClientSocket objects in a
* server. Having more Infos than a server can have means something
* has gone wrong somewhere, i.e. the server has more Infos than it
* has actual clients. That means the server is feeding us an invalid
* state. So, bail out! This server is broken. */
if (!NetworkClientInfo::CanAllocateItem()) return NETWORK_RECV_STATUS_MALFORMED_PACKET;
/* We don't have this client_id yet, find an empty client_id, and put the data there */ /* We don't have this client_id yet, find an empty client_id, and put the data there */
ci = new NetworkClientInfo(client_id); ci = new NetworkClientInfo(client_id);
ci->client_playas = playas; ci->client_playas = playas;