Commit 93b10c3

authored

Fix xmlLoadString memory leak (#1531)

Co-authored

1 parent 8e465dc commit 93b10c3Copy full SHA for 93b10c3

File tree

+18

-3

lines changed

+18

-3

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ CLuaMain::~CLuaMain()`
`57`	`57`
`58`	`58`	`// Delete the timer manager`
`59`	`59`	`delete m_pLuaTimerManager;`
	`60`	`+`
	`61`	`+ for (auto& xmlNode : m_XMLNodes)`
	`62`	`+ {`
	`63`	`+ delete xmlNode;`
	`64`	`+ }`
`60`	`65`
`61`	`66`	`CClientPerfStatLuaMemory::GetSingleton()->OnLuaMainDestroy(this);`
`62`	`67`	`CClientPerfStatLuaTiming::GetSingleton()->OnLuaMainDestroy(this);`
`@@ -366,6 +371,8 @@ CXMLFile* CLuaMain::CreateXML(const char* szFilename, bool bUseIDs, bool bReadOn`
`366`	`371`	`CXMLNode* CLuaMain::ParseString(const char* strXmlContent)`
`367`	`372`	`{`
`368`	`373`	`CXMLNode* xmlNode = g_pCore->GetXML()->ParseString(strXmlContent);`
	`374`	`+ if (xmlNode)`
	`375`	`+ m_XMLNodes.push_back(xmlNode);`
`369`	`376`	`return xmlNode;`
`370`	`377`	`}`
`371`	`378`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ class CLuaMain //: public CClient`
`96`	`96`	`class CResource* m_pResource;`
`97`	`97`
`98`	`98`	`std::list<CXMLFile*> m_XMLFiles;`
	`99`	`+ std::list<CXMLNode*> m_XMLNodes;`
`99`	`100`	`static SString ms_strExpectedUndumpHash;`
`100`	`101`
`101`	`102`	`bool m_bEnableOOP;`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,14 @@ CLuaMain::~CLuaMain()`
`72`	`72`	`delete m_pLuaTimerManager;`
`73`	`73`
`74`	`74`	`// Eventually delete the XML files the LUA script didn't`
`75`		`- list<CXMLFile*>::iterator iterXML = m_XMLFiles.begin();`
`76`		`- for (; iterXML != m_XMLFiles.end(); ++iterXML)`
	`75`	`+ for (auto& xmlFile : m_XMLFiles)`
`77`	`76`	`{`
`78`		`- delete *iterXML;`
	`77`	`+ delete xmlFile;`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ for (auto& xmlNode : m_XMLNodes)`
	`81`	`+ {`
	`82`	`+ delete xmlNode;`
`79`	`83`	`}`
`80`	`84`
`81`	`85`	`// Eventually delete the text displays the LUA script didn't`
`@@ -419,6 +423,8 @@ CXMLFile* CLuaMain::CreateXML(const char* szFilename, bool bUseIDs, bool bReadOn`
`419`	`423`	`CXMLNode* CLuaMain::ParseString(const char* strXmlContent)`
`420`	`424`	`{`
`421`	`425`	`CXMLNode* xmlNode = g_pServerInterface->GetXML()->ParseString(strXmlContent);`
	`426`	`+ if (xmlNode)`
	`427`	`+ m_XMLNodes.push_back(xmlNode);`
`422`	`428`	`return xmlNode;`
`423`	`429`	`}`
`424`	`430`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ class CLuaMain //: public CClient`
`134`	`134`	`CMapManager* m_pMapManager;`
`135`	`135`
`136`	`136`	`list<CXMLFile*> m_XMLFiles;`
	`137`	`+ list<CXMLNode*> m_XMLNodes;`
`137`	`138`	`list<CTextDisplay*> m_Displays;`
`138`	`139`	`list<CTextItem*> m_TextItems;`
`139`	`140`

Comments

(0)