From 207782c8092405ade267e8497a0b07b9c555a97c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 9 Sep 2007 08:11:25 +0000 Subject: [PATCH] Propagate element errors (STR #46) --- CHANGES | 2 ++ mxml-file.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 784f3a4..da15371 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/mxml-file.c b/mxml-file.c index cd3ab77..d33ce49 100644 --- 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)) != '>')