Propagate element errors (STR #46)

17 years ago · 207782c809
parent 7f26d51318
commit 207782c809
2 changed files with 6 additions and 1 deletions
--- a/2
+++ b/2
@ -3,6 +3,8 @@ CHANGES - 2007-09-09

 CHANGES IN Mini-XML 2.3.1

+	- mxmlLoad*() did not return NULL when an element contained
+	  an error (STR #46)
 	- Added support for the apos character entity (STR #54)
 	- Fixed whitespace detection with Unicode characters (STR
 	  #48)
--- a/mxml-file.c
+++ b/mxml-file.c
@ -1986,7 +1986,10 @@ mxml_load_data(
 	}

        if (mxml_isspace(ch))
-          ch = mxml_parse_element(node, p, &encoding, getc_cb);
+        {
+	  if ((ch = mxml_parse_element(node, p, &encoding, getc_cb)) == EOF)
+	    goto error;
+        }
        else if (ch == '/')
 	{
 	  if ((ch = (*getc_cb)(p, &encoding)) != '>')