From c707d0b76563946c7b74ae78a249d0242acd0832 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 24 Jan 2008 14:48:54 +0000 Subject: [PATCH] fix a memeory leak in internal subset parsing with a fix from Ashwin add * parser.c: fix a memeory leak in internal subset parsing with a fix from Ashwin * test/errors/content1.xml result/errors/content1.xml*: add test to regressions Daniel svn path=/trunk/; revision=3680 --- ChangeLog | 7 +++++++ configure.in | 2 +- doc/devhelp/libxml2-valid.html | 2 +- doc/libxml2-api.xml | 10 +++++----- parser.c | 2 ++ result/errors/content1.xml | 0 result/errors/content1.xml.err | 15 +++++++++++++++ result/errors/content1.xml.str | 13 +++++++++++++ test/errors/content1.xml | 10 ++++++++++ 9 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 result/errors/content1.xml create mode 100644 result/errors/content1.xml.err create mode 100644 result/errors/content1.xml.str create mode 100644 test/errors/content1.xml diff --git a/ChangeLog b/ChangeLog index 8d12f63a..3e44a141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jan 24 15:37:04 CET 2008 Daniel Veillard + + * parser.c: fix a memeory leak in internal subset parsing with + a fix from Ashwin + * test/errors/content1.xml result/errors/content1.xml*: + add test to regressions + Fri Jan 11 09:00:09 CET 2008 Daniel Veillard * configure.in doc/*: preparing release of 2.6.31 diff --git a/configure.in b/configure.in index dbc39323..699232fd 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=30 +LIBXML_MICRO_VERSION=31 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html index 3b23e670..3480214a 100644 --- a/doc/devhelp/libxml2-valid.html +++ b/doc/devhelp/libxml2-valid.html @@ -101,6 +101,7 @@ int xmlIsRef (xm xmlElementContentPtr xmlCopyDocElementContent (xmlDocPtr doc,
xmlElementContentPtr cur); xmlIDPtr xmlAddID (xmlValidCtxtPtr ctxt,
xmlDocPtr doc,
const xmlChar * value,
xmlAttrPtr attr); void xmlFreeRefTable (xmlRefTablePtr table); +int xmlValidateNamesValue (const xmlChar * value); int xmlRemoveID (xmlDocPtr doc,
xmlAttrPtr attr); void xmlFreeElementTable (xmlElementTablePtr table); void xmlFreeIDTable (xmlIDTablePtr table); @@ -112,7 +113,6 @@ int xmlRemoveRef (xmlValidityWarningFunc (void * ctx,
const char * msg,
... ...); int xmlValidatePopElement (xmlValidCtxtPtr ctxt,
xmlDocPtr doc,
xmlNodePtr elem,
const xmlChar * qname); void xmlFreeEnumeration (xmlEnumerationPtr cur); -int xmlValidateNamesValue (const xmlChar * value); xmlEnumerationPtr xmlCopyEnumeration (xmlEnumerationPtr cur); xmlAttributePtr xmlGetDtdAttrDesc (xmlDtdPtr dtd,
const xmlChar * elem,
const xmlChar * name); int xmlValidateDtd (xmlValidCtxtPtr ctxt,
xmlDocPtr doc,
xmlDtdPtr dtd); diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 4e031bc9..df478d6c 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -1211,13 +1211,13 @@ - + - + @@ -1744,6 +1744,7 @@ + @@ -1755,7 +1756,6 @@ - @@ -3452,15 +3452,15 @@ - + + - diff --git a/parser.c b/parser.c index 529e061e..f5d96659 100644 --- a/parser.c +++ b/parser.c @@ -5332,6 +5332,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { } } else { xmlFatalErr(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED, NULL); + if ((last != NULL) && (last != ret)) + xmlFreeDocElementContent(ctxt->myDoc, last); if (ret != NULL) xmlFreeDocElementContent(ctxt->myDoc, ret); return(NULL); diff --git a/result/errors/content1.xml b/result/errors/content1.xml new file mode 100644 index 00000000..e69de29b diff --git a/result/errors/content1.xml.err b/result/errors/content1.xml.err new file mode 100644 index 00000000..e86c7f98 --- /dev/null +++ b/result/errors/content1.xml.err @@ -0,0 +1,15 @@ +./test/errors/content1.xml:7: parser error : ContentDecl : ',' '|' or ')' expected + + ^ +./test/errors/content1.xml:7: parser error : expected '>' + + ^ +./test/errors/content1.xml:7: parser error : internal error + + ^ +./test/errors/content1.xml:7: parser error : DOCTYPE improperly terminated + + ^ +./test/errors/content1.xml:7: parser error : Start tag expected, '<' not found + + ^ diff --git a/result/errors/content1.xml.str b/result/errors/content1.xml.str new file mode 100644 index 00000000..da346f84 --- /dev/null +++ b/result/errors/content1.xml.str @@ -0,0 +1,13 @@ +./test/errors/content1.xml:7: parser error : ContentDecl : ',' '|' or ')' expected + + ^ +./test/errors/content1.xml:7: parser error : expected '>' + + ^ +./test/errors/content1.xml:7: parser error : internal error + + ^ +./test/errors/content1.xml:7: parser error : DOCTYPE improperly terminated + + ^ +./test/errors/content1.xml : failed to parse diff --git a/test/errors/content1.xml b/test/errors/content1.xml new file mode 100644 index 00000000..7264694b --- /dev/null +++ b/test/errors/content1.xml @@ -0,0 +1,10 @@ + + + + + + +]> +Any content +