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

1 files changed, 7 insertions, 0 deletions

diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 658d3a0e8..2d75353df 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -568,6 +568,13 @@ DEF_GAME_RECEIVE_COMMAND(Client, PACKET_SERVER_CLIENT_INFO)
 		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 */
 	ci = new NetworkClientInfo(client_id);
 	ci->client_playas = playas;