summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rest/rest-xml-parser.c3
-rw-r--r--tests/xml.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/rest/rest-xml-parser.c b/rest/rest-xml-parser.c
index ffa6ff3..796052e 100644
--- a/rest/rest-xml-parser.c
+++ b/rest/rest-xml-parser.c
@@ -103,6 +103,9 @@ rest_xml_parser_parse_from_data (RestXmlParser *parser,
NULL, /* URL? */
NULL, /* encoding */
XML_PARSE_RECOVER | XML_PARSE_NOCDATA);
+ if (reader == NULL) {
+ return NULL;
+ }
xmlTextReaderSetErrorHandler(reader, rest_xml_parser_xml_reader_error, NULL);
while (xmlTextReaderRead (reader) == 1)
diff --git a/tests/xml.c b/tests/xml.c
index 4b7718b..9d03e29 100644
--- a/tests/xml.c
+++ b/tests/xml.c
@@ -34,6 +34,12 @@ main (int argc, char **argv)
parser = rest_xml_parser_new ();
+ root = rest_xml_parser_parse_from_data (parser, "", -1);
+ g_assert (root == NULL);
+
+ root = rest_xml_parser_parse_from_data (parser, "<invalid", -1);
+ g_assert (root == NULL);
+
root = rest_xml_parser_parse_from_data (parser, TEST_XML, strlen (TEST_XML));
g_assert (root);