Fix server crash on info request with invalid token

Author: Robyt3

src/engine/server/server.cpp

@@ -1071,7 +1071,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 	}
 }
 
-void CServer::GenerateServerInfo(CPacker *pPacker, int Token)
+void CServer::GenerateServerInfo(CPacker *pPacker, bool IncludeClientInfo)
 {
 	// count the players
 	int PlayerCount = 0, ClientCount = 0;
@@ -1086,13 +1086,6 @@ void CServer::GenerateServerInfo(CPacker *pPacker, int Token)
 		}
 	}
 
-	if(Token != -1)
-	{
-		pPacker->Reset();
-		pPacker->AddRaw(SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO));
-		pPacker->AddInt(Token);
-	}
-
 	pPacker->AddString(GameServer()->Version(), 32);
 	pPacker->AddString(Config()->m_SvName, 64);
 	pPacker->AddString(Config()->m_SvHostname, 128);
@@ -1115,7 +1108,7 @@ void CServer::GenerateServerInfo(CPacker *pPacker, int Token)
 	pPacker->AddInt(ClientCount); // num clients
 	pPacker->AddInt(maximum(ClientCount, Config()->m_SvMaxClients)); // max clients
 
-	if(Token != -1)
+	if(IncludeClientInfo)
 	{
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
@@ -1134,7 +1127,7 @@ void CServer::GenerateServerInfo(CPacker *pPacker, int Token)
 void CServer::SendServerInfo(int ClientID)
 {
 	CMsgPacker Msg(NETMSG_SERVERINFO, true);
-	GenerateServerInfo(&Msg, -1);
+	GenerateServerInfo(&Msg, false);
 	if(ClientID == -1)
 	{
 		for(int i = 0; i < MAX_CLIENTS; i++)
@@ -1172,10 +1165,12 @@ void CServer::PumpNetwork()
 					continue;
 
 				CPacker Packer;
-				CNetChunk Response;
-
-				GenerateServerInfo(&Packer, SrvBrwsToken);
+				Packer.Reset();
+				Packer.AddRaw(SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO));
+				Packer.AddInt(SrvBrwsToken);
+				GenerateServerInfo(&Packer, true);
 
+				CNetChunk Response;
 				Response.m_ClientID = -1;
 				Response.m_Address = Packet.m_Address;
 				Response.m_Flags = NETSENDFLAG_CONNLESS;

src/engine/server/server.h

@@ -243,7 +243,7 @@ class CServer : public IServer
 	void ProcessClientPacket(CNetChunk *pPacket);
 
 	void SendServerInfo(int ClientID);
-	void GenerateServerInfo(CPacker *pPacker, int Token);
+	void GenerateServerInfo(CPacker *pPacker, bool IncludeClientInfo);
 
 	void PumpNetwork();