c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch from Vasily Chekalkin fixes memory leaks, should fix 512647 Daniel

Browse Source 
* parser.c xinclude.c: patch from Vasily Chekalkin fixes memory
  leaks, should fix 512647
Daniel

svn path=/trunk/; revision=3706
This commit is contained in:
Daniel Veillard 2008-03-14 10:54:00 +00:00
parent 10bda629bf
commit 37d2d16c89
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Mar 14 11:52:09 CET 2008 Daniel Veillard <daniel@veillard.com>
* parser.c xinclude.c: patch from Vasily Chekalkin fixes memory
leaks, should fix 512647
Thu Mar 13 08:17:58 CET 2008 Daniel Veillard <daniel@veillard.com>
* xmlregexp.c: found a nasty bug in regexp automata build,

7
parser.c
View File

@ -12376,7 +12376,6 @@ xmlSAXParseFileWithData(xmlSAXHandlerPtr sax, const char *filename,
int recovery, void *data) {
xmlDocPtr ret;
xmlParserCtxtPtr ctxt;
char *directory = NULL;
xmlInitParser();
@ -12394,10 +12393,8 @@ xmlSAXParseFileWithData(xmlSAXHandlerPtr sax, const char *filename,
ctxt->_private = data;
}
if ((ctxt->directory == NULL) && (directory == NULL))
directory = xmlParserGetDirectory(filename);
if ((ctxt->directory == NULL) && (directory != NULL))
ctxt->directory = (char *) xmlStrdup((xmlChar *) directory);
if (ctxt->directory == NULL)
ctxt->directory = xmlParserGetDirectory(filename);
ctxt->recovery = recovery;

7
xinclude.c
View File

@ -419,7 +419,6 @@ static xmlDocPtr
xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) {
xmlDocPtr ret;
xmlParserCtxtPtr pctxt;
char *directory = NULL;
xmlParserInputPtr inputStream;
xmlInitParser();
@ -456,10 +455,8 @@ xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) {
inputPush(pctxt, inputStream);
if ((pctxt->directory == NULL) && (directory == NULL))
directory = xmlParserGetDirectory(URL);
if ((pctxt->directory == NULL) && (directory != NULL))
pctxt->directory = (char *) xmlStrdup((xmlChar *) directory);
if (pctxt->directory == NULL)
pctxt->directory = xmlParserGetDirectory(URL);
pctxt->loadsubset |= XML_DETECT_IDS;