Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Release libxml2 structures before exit

Browse source
This commit is contained in:
kervala 2016-12-04 19:17:21 +01:00
parent ab047793cf
commit 0da495081a
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/include/nel/misc/i_xml.h
View file

@ -171,6 +171,11 @@ public:
*/ */
static bool getContentString (std::string &result, xmlNodePtr node); static bool getContentString (std::string &result, xmlNodePtr node);
/**
* Release meory used by libxml2, to only call before exit.
*/
static void releaseLibXml();
private: private:
/// From IStream /// From IStream

7
code/nel/src/misc/i_xml.cpp
View file

@ -103,13 +103,11 @@ void CIXml::release ()
// Free it // Free it
xmlClearParserCtxt (_Parser); xmlClearParserCtxt (_Parser);
xmlFreeParserCtxt (_Parser); xmlFreeParserCtxt (_Parser);
// commented due to the bug #857 xmlCleanupParser ();
_Parser = NULL; _Parser = NULL;
} }
// Not initialized // Not initialized
_Parser = NULL;
_CurrentElement = NULL; _CurrentElement = NULL;
_CurrentNode = NULL; _CurrentNode = NULL;
_PushBegin = false; _PushBegin = false;
@ -1143,6 +1141,11 @@ bool CIXml::getContentString (std::string &result, xmlNodePtr node)
// *************************************************************************** // ***************************************************************************
void CIXml::releaseLibXml()
{
xmlCleanupParser();
}
} // NLMISC } // NLMISC
#endif // NL_DONT_USE_EXTERNAL_CODE #endif // NL_DONT_USE_EXTERNAL_CODE

1
code/ryzom/client/src/release.cpp
View file

@ -664,6 +664,7 @@ void release()
NLGUI::CDBManager::release(); NLGUI::CDBManager::release();
CWidgetManager::release(); CWidgetManager::release();
CViewRenderer::release(); CViewRenderer::release();
CIXml::releaseLibXml();
#if FINAL_VERSION #if FINAL_VERSION
// openURL ("http://www.ryzomcore.org/exit/"); // openURL ("http://www.ryzomcore.org/exit/");