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

XML_Parser::storeAtts: don't leak in case of realloc failure

Browse Source
This commit is contained in:
Stefan Seyfried
2014-01-09 14:56:45 +01:00
committed by svenhoefer
parent 0cd6cfa68c
commit 6944d53cef
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/xmltree/xmlparse.cpp
View File

@@ -132,7 +132,8 @@ XML_Parser::XML_Parser(const XML_Char *encodingName)
tagStack=0; tagStack=0;
freeTagList=0; freeTagList=0;
attsSize=INIT_ATTS_SIZE; attsSize=INIT_ATTS_SIZE;
atts=new ATTRIBUTE[attsSize]; /* must not realloc stuff allocated with new[] */
atts=(ATTRIBUTE *)malloc(attsSize * sizeof(ATTRIBUTE));
dataBuf=new XML_Char[INIT_DATA_BUF_SIZE]; dataBuf=new XML_Char[INIT_DATA_BUF_SIZE];
groupSize=0; groupSize=0;
groupConnector=0; groupConnector=0;
@@ -152,7 +153,7 @@ XML_Parser::XML_Parser(const XML_Char *encodingName)
poolDestroy(&tempPool); poolDestroy(&tempPool);
poolDestroy(&temp2Pool); poolDestroy(&temp2Pool);
if (atts) delete[] atts; if (atts) free(atts);
if (dataBuf) delete[] dataBuf; if (dataBuf) delete[] dataBuf;
return; return;
@@ -204,7 +205,7 @@ XML_Parser::~XML_Parser()
poolDestroy(&temp2Pool); poolDestroy(&temp2Pool);
dtdDestroy(&dtd); dtdDestroy(&dtd);
delete[] atts; free(atts);
free(groupConnector); free(groupConnector);
free(buffer); free(buffer);
delete[] dataBuf; delete[] dataBuf;
@@ -1099,9 +1100,11 @@ enum XML_Error XML_Parser::storeAtts(const ENCODING *enc, const XML_Char *tagNam
attsSize=n+nDefaultAtts+INIT_ATTS_SIZE; attsSize=n+nDefaultAtts+INIT_ATTS_SIZE;
atts=(ATTRIBUTE *) realloc((void *) atts, attsSize*sizeof(ATTRIBUTE)); ATTRIBUTE *newatts = (ATTRIBUTE *) realloc((void *) atts, attsSize*sizeof(ATTRIBUTE));
if (!atts) return XML_ERROR_NO_MEMORY; if (!newatts) return XML_ERROR_NO_MEMORY;
atts = newatts;
if (n>oldAttsSize) XmlGetAttributes(enc, s, n, atts); if (n>oldAttsSize) XmlGetAttributes(enc, s, n, atts);
}; };