From aae811152fc137b25e8d3a5a1fd381ed63d283d7 Mon Sep 17 00:00:00 2001
From: Rhodri James <rhodri@kynesim.co.uk>
Date: Fri, 17 Mar 2017 15:26:12 +0000
Subject: [PATCH] Test resuming a general entity catches XML errors

---
 expat/tests/runtests.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 54168a8f..8f5b2ac2 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -4682,6 +4682,26 @@ START_TEST(test_suspend_resume_internal_entity)
 }
 END_TEST
 
+/* Test syntax error is caught at parse resumption */
+START_TEST(test_resume_entity_with_syntax_error)
+{
+    const char *text =
+        "<!DOCTYPE doc [\n"
+        "<!ENTITY foo '<suspend>Hi</wombat>'>\n"
+        "]>\n"
+        "<doc>&foo;</doc>\n";
+
+    XML_SetStartElementHandler(parser, start_element_suspender);
+    if (XML_Parse(parser, text, strlen(text),
+                  XML_TRUE) != XML_STATUS_SUSPENDED)
+        xml_failure(parser);
+    if (XML_ResumeParser(parser) != XML_STATUS_ERROR)
+        fail("Syntax error in entity not faulted");
+    if (XML_GetErrorCode(parser) != XML_ERROR_TAG_MISMATCH)
+        xml_failure(parser);
+}
+END_TEST
+
 /* Test suspending and resuming in a parameter entity substitution */
 static void XMLCALL
 element_decl_suspender(void *UNUSED_P(userData),
@@ -7988,6 +8008,7 @@ make_suite(void)
     tcase_add_test(tc_basic, test_partial_char_in_epilog);
     tcase_add_test(tc_basic, test_hash_collision);
     tcase_add_test(tc_basic, test_suspend_resume_internal_entity);
+    tcase_add_test(tc_basic, test_resume_entity_with_syntax_error);
     tcase_add_test(tc_basic, test_suspend_resume_parameter_entity);
 
     suite_add_tcase(s, tc_namespace);
-- 
2.40.0