constcast/vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't leak the xmlString in Cfg

Browse Source 
Valgrind was reporting lots of leaks of the form:

==5048==    at 0x4C2BBAF: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==5048==    by 0x5D50D18: xmlBufCreateSize (in /usr/lib/x86_64-linux-gnu/libxml2.so.2.9.4)
==5048==    by 0x5CDDD91: xmlNodeGetContent (in /usr/lib/x86_64-linux-gnu/libxml2.so.2.9.4)
==5048==    by 0x38EB01: XMLNode::getContent[abi:cxx11]() const (in /usr/sbin/vermont)
==5048==    by 0x285B62: CollectorCfg::CollectorCfg(XMLElement*, unsigned int) (in /usr/sbin/vermont)

The API guide for xmlNodeGetContent() states:

Returns: a new #xmlChar * or NULL if no content is available. It's up to the caller to free the memory with xmlFree().

So call xmlFree() after using the std:string copy constructor

Fixes #117
This commit is contained in:
Nicholas Brown 2018-11-05 10:53:21 +00:00
parent e3fb206034
commit eefb9e8d61
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/XMLNode.cpp
View File

@ -22,7 +22,10 @@ std::string XMLNode::getName() const
const std::string XMLNode::getContent() const
{
return std::string((const char*)xmlNodeGetContent(xmlNode));
xmlChar *xmlString = xmlNodeGetContent(xmlNode);
std::string string ((const char*)xmlString);
xmlFree(xmlString);
return string;
}
XMLNode::XMLNodeSet XMLNode::findChildren(const std::string& name)