From: Rhodri James <rhodri@kynesim.co.uk>
Date: Wed, 15 Mar 2017 12:16:05 +0000 (+0000)
Subject: Remove warning about potentially unset variable in tests
X-Git-Tag: R_2_2_3~22^2~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be42a4ae1fc96d30537bf0e63167525a0eb5ac72;p=libexpat

Remove warning about potentially unset variable in tests

Also make test function external_entity_public() more robust
against misuse.
---

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 81b2734f..79fbe522 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -5889,7 +5889,7 @@ external_entity_public(XML_Parser parser,
 {
     const char *text1 = (const char *)XML_GetUserData(parser);
     const char *text2 = "<!ATTLIST doc a CDATA 'value'>";
-    const char *text;
+    const char *text = NULL;
     XML_Parser ext_parser;
     int parse_res;
 
@@ -5902,6 +5902,8 @@ external_entity_public(XML_Parser parser,
     else if (publicId != NULL && !strcmp(publicId, "foo")) {
         text = text2;
     }
+    else
+        fail("Unexpected parameters to external entity parser");
     parse_res = _XML_Parse_SINGLE_BYTES(ext_parser, text, strlen(text),
                                    XML_TRUE);
     XML_ParserFree(ext_parser);