Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 21d43ace71e2 · 2025-03-05T23:56:17.000Z
e347659 Fix server cache memory leak (#4069)
diff --git a/Client/core/ServerBrowser/CServerCache.cpp b/Client/core/ServerBrowser/CServerCache.cpp
@@ -186,6 +186,10 @@ bool CServerCache::LoadServerCache()
 
         MapSet(m_ServerCachedMap, key, info);
     }
+
+    delete pNode;
+    delete m_pConfigFile;
+
     return true;
 }
 
@@ -302,6 +306,9 @@ void CServerCache::StaticSaveServerCache()
     XMLAccess.SetSubNodeValue(CONFIG_NODE_SERVER_INT "11", dataSet);
 
     m_pConfigFile->Write();
+
+    delete pNode;
+    delete m_pConfigFile;
 }
 
 ///////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,10 @@ bool CServerCache::LoadServerCache()`
`186`	`186`
`187`	`187`	`MapSet(m_ServerCachedMap, key, info);`
`188`	`188`	`}`
	`189`	`+`
	`190`	`+ delete pNode;`
	`191`	`+ delete m_pConfigFile;`
	`192`	`+`
`189`	`193`	`return true;`
`190`	`194`	`}`
`191`	`195`
`@@ -302,6 +306,9 @@ void CServerCache::StaticSaveServerCache()`
`302`	`306`	`XMLAccess.SetSubNodeValue(CONFIG_NODE_SERVER_INT "11", dataSet);`
`303`	`307`
`304`	`308`	`m_pConfigFile->Write();`
	`309`	`+`
	`310`	`+ delete pNode;`
	`311`	`+ delete m_pConfigFile;`
`305`	`312`	`}`
`306`	`313`
`307`	`314`	`///////////////////////////////////////////////////////////////`