mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

xmlinterface: fix possible memleak

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-01-21 14:53:19 +01:00
parent 6e7a7d4bae
commit 483aeea387
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/xmltree/xmlinterface.cpp
View File

@@ -280,14 +280,23 @@ xmlDocPtr parseXmlFile(const char * filename, bool,const char* encoding)
} }
pugi::xml_document* tree_parser = new pugi::xml_document(); pugi::xml_document* tree_parser = new pugi::xml_document();
if (zipped) if (zipped)
{ {
int fd = open(filename, O_RDONLY); int fd = open(filename, O_RDONLY);
if(fd == -1)
{
delete tree_parser;
return NULL;
}
uint32_t gzsize = 0; uint32_t gzsize = 0;
lseek(fd, -4, SEEK_END); lseek(fd, -4, SEEK_END);
read(fd, &gzsize, 4); int res = read(fd, &gzsize, 4);
if(res <= 0)
{
delete tree_parser;
return NULL;
}
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
gzFile xmlgz_file = gzdopen(fd,"rb"); gzFile xmlgz_file = gzdopen(fd,"rb");
@@ -319,6 +328,7 @@ xmlDocPtr parseXmlFile(const char * filename, bool,const char* encoding)
if (read_size != gzsize) if (read_size != gzsize)
{ {
gzclose(xmlgz_file); gzclose(xmlgz_file);
free(buffer);
delete tree_parser; delete tree_parser;
return NULL; return NULL;
} }
@@ -329,6 +339,7 @@ xmlDocPtr parseXmlFile(const char * filename, bool,const char* encoding)
if (result.status != 0 /*pugi::xml_parse_status::status_ok*/) if (result.status != 0 /*pugi::xml_parse_status::status_ok*/)
{ {
printf("Error: Loading %s (%d)\n", filename, result.status); printf("Error: Loading %s (%d)\n", filename, result.status);
free( buffer);
delete tree_parser; delete tree_parser;
return NULL; return NULL;
} }