From 3d495a9936174b81e5beccf1c9a697f131f37478 Mon Sep 17 00:00:00 2001
From: Learath2 <learath2@gmail.com>
Date: Sun, 3 Nov 2019 01:53:50 +0100
Subject: [PATCH] Initialize variables

---
 src/engine/server/server.cpp | 20 ++++++++++++++------
 src/engine/server/server.h   |  3 +++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 9d99311df..3df506451 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -285,6 +285,7 @@ CServer::CServer()
 
 	m_ServerInfoFirstRequest = 0;
 	m_ServerInfoNumRequests = 0;
+	m_ServerInfoNeedsUpdate = false;
 
 #ifdef CONF_FAMILY_UNIX
 	m_ConnLoggingSocketCreated = false;
@@ -1503,6 +1504,16 @@ void CServer::SendServerInfoConnless(const NETADDR *pAddr, int Token, int Type)
 	SendServerInfo(pAddr, Token, Type, SendClients);
 }
 
+CServer::CCache::CCache()
+{
+	m_pRoot = m_pTail = 0;
+}
+
+CServer::CCache::~CCache()
+{
+	Clear();
+}
+
 void CServer::CCache::AddChunk(const void *pData, int Size)
 {
 	SCacheChunk *pNew = new SCacheChunk;
@@ -1518,6 +1529,7 @@ void CServer::CCache::AddChunk(const void *pData, int Size)
 	mem_copy(pNew->m_pData, pData, Size);
 	pNew->m_DataSize = Size;
 
+	pNew->m_pNext = 0;
 	if(!m_pRoot)
 		m_pRoot = m_pTail = pNew;
 	else
@@ -1532,8 +1544,8 @@ void CServer::CCache::Clear()
 	if(!m_pRoot)
 		return;
 
-	SCacheChunk *pChunk = m_pRoot, *pTmp = 0;
-	while(pChunk)
+	SCacheChunk *pTmp = 0;
+	for(SCacheChunk *pChunk = m_pRoot; pChunk;)
 	{
 		pTmp = pChunk;
 		pChunk = pChunk->m_pNext;
@@ -2220,10 +2232,6 @@ int CServer::Run()
 			m_NetServer.Drop(i, pDisconnectReason);
 	}
 
-	for(int i = 0; i < 3; i++)
-		for(int j = 0; j < 2; j++)
-			m_ServerInfoCache[i * 2 + j].Clear();
-
 	m_Econ.Shutdown();
 
 #if defined(CONF_FAMILY_UNIX)
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index 7e3896ded..4e545b4ee 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -304,6 +304,9 @@ public:
 		SCacheChunk *m_pRoot, *m_pTail;
 
 	public:
+		CCache();
+		~CCache();
+
 		void AddChunk(const void *pData, int Size);
 		SCacheChunk *GetFirst() { return m_pRoot; };
 		void Clear();