Fix segfault in mxmlLoad*() with invalid XML.

19 years ago · e0262e0099
parent 82913f58c7
commit e0262e0099
5 changed files with 11 additions and 5 deletions
--- a/8
+++ b/8
@ -1,6 +1,12 @@
-CHANGES - 05/19/2005
+CHANGES - 05/30/2005
 --------------------

+CHANGES IN Mini-XML 2.2.3
+
+	- mxmlLoad*() crashed when reporting an error in some
+	  invalid XML (STR #23)
+
+
 CHANGES IN Mini-XML 2.2.2

 	- mxmlLoad*() did not treat custom data as opaque, so
--- a/configure.in
+++ b/configure.in
@ -23,7 +23,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number...
-VERSION=2.2.2
+VERSION=2.2.3
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(MXML_VERSION, "Mini-XML v$VERSION")

--- a/doc/reference.html
+++ b/doc/reference.html
@ -2,7 +2,7 @@
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
 <head>
 	<title>Documentation</title>
-	<meta name='creator' content='Mini-XML v2.2.1'/>
+	<meta name='creator' content='Mini-XML v2.2.2'/>
 	<style><!--
 	h1, h2, h3, p { font-family: sans-serif; text-align: justify; }
 	tt, pre a:link, pre a:visited, tt a:link, tt a:visited { font-weight: bold; color: #7f0000; }
--- a/mxml-file.c
+++ b/mxml-file.c
@ -1703,7 +1703,7 @@ mxml_load_data(mxml_node_t *top,	/* I - Top node */
 	  */

 	  mxml_error("Mismatched close tag <%s> under parent <%s>!",
-	             buffer, parent->value.element.name);
+	             buffer, parent ? parent->value.element.name : "(nil)");
          goto error;
 	}

--- a/mxml.spec
+++ b/mxml.spec
@ -18,7 +18,7 @@

 Summary: Miniature XML development library
 Name: mxml
-Version: 2.2.2
+Version: 2.2.3
 Release: 1
 Copyright: GPL
 Group: Development/Libraries