organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-07 14:09:26 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Move test_start_ns_clears_start_element out of runtests.c

Browse source
This commit is contained in:
Rhodri James 2022-10-31 11:32:41 +00:00
parent afd8c08b80
commit 707e4af1d6
4 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
expat/tests/handlers.c
View file

@ -234,6 +234,25 @@ overwrite_end_checker(void *userData, const XML_Char *name) {
CharData_AppendXMLChars(storage, XCS("\n"), 1);
}
void XMLCALL
start_element_fail(void *userData, const XML_Char *name,
const XML_Char **atts) {
UNUSED_P(userData);
UNUSED_P(name);
UNUSED_P(atts);
/* We should never get here. */
fail("should never reach start_element_fail()");
}
void XMLCALL
start_ns_clearing_start_element(void *userData, const XML_Char *prefix,
const XML_Char *uri) {
UNUSED_P(prefix);
UNUSED_P(uri);
XML_SetStartElementHandler((XML_Parser)userData, NULL);
}
/* Text encoding handlers */
int XMLCALL

7
expat/tests/handlers.h
View file

@ -113,6 +113,13 @@ extern void XMLCALL overwrite_start_checker(void *userData,
extern void XMLCALL overwrite_end_checker(void *userData, const XML_Char *name);
extern void XMLCALL start_element_fail(void *userData, const XML_Char *name,
const XML_Char **atts);
extern void XMLCALL start_ns_clearing_start_element(void *userData,
const XML_Char *prefix,
const XML_Char *uri);
/* Text encoding handlers */
extern int XMLCALL UnknownEncodingHandler(void *data, const XML_Char *encoding,

19
expat/tests/ns_tests.c
View file

@ -165,6 +165,24 @@ START_TEST(test_ns_tagname_overwrite_triplet) {
}
END_TEST
/* Regression test for SF bug #620343. */
START_TEST(test_start_ns_clears_start_element) {
/* This needs to use separate start/end tags; using the empty tag
syntax doesn't cause the problematic path through Expat to be
taken.
*/
const char *text = "<e xmlns='http://example.org/'></e>";
XML_SetStartElementHandler(g_parser, start_element_fail);
XML_SetStartNamespaceDeclHandler(g_parser, start_ns_clearing_start_element);
XML_SetEndNamespaceDeclHandler(g_parser, dummy_end_namespace_decl_handler);
XML_UseParserAsHandlerArg(g_parser);
if (_XML_Parse_SINGLE_BYTES(g_parser, text, (int)strlen(text), XML_TRUE)
== XML_STATUS_ERROR)
xml_failure(g_parser);
}
END_TEST
TCase *
make_namespace_test_case(Suite *s) {
TCase *tc_namespace = tcase_create("XML namespaces");
@ -175,6 +193,7 @@ make_namespace_test_case(Suite *s) {
tcase_add_test(tc_namespace, test_ns_parser_reset);
tcase_add_test(tc_namespace, test_ns_tagname_overwrite);
tcase_add_test(tc_namespace, test_ns_tagname_overwrite_triplet);
tcase_add_test(tc_namespace, test_start_ns_clears_start_element);
return tc_namespace; /* TEMPORARY; this will become a void function */
}

38
expat/tests/runtests.c
View file

@ -79,43 +79,6 @@ XML_Parser g_parser = NULL;
* Namespaces tests.
*/
/* Regression test for SF bug #620343. */
static void XMLCALL
start_element_fail(void *userData, const XML_Char *name,
const XML_Char **atts) {
UNUSED_P(userData);
UNUSED_P(name);
UNUSED_P(atts);
/* We should never get here. */
fail("should never reach start_element_fail()");
}
static void XMLCALL
start_ns_clearing_start_element(void *userData, const XML_Char *prefix,
const XML_Char *uri) {
UNUSED_P(prefix);
UNUSED_P(uri);
XML_SetStartElementHandler((XML_Parser)userData, NULL);
}
START_TEST(test_start_ns_clears_start_element) {
/* This needs to use separate start/end tags; using the empty tag
syntax doesn't cause the problematic path through Expat to be
taken.
*/
const char *text = "<e xmlns='http://example.org/'></e>";
XML_SetStartElementHandler(g_parser, start_element_fail);
XML_SetStartNamespaceDeclHandler(g_parser, start_ns_clearing_start_element);
XML_SetEndNamespaceDeclHandler(g_parser, dummy_end_namespace_decl_handler);
XML_UseParserAsHandlerArg(g_parser);
if (_XML_Parse_SINGLE_BYTES(g_parser, text, (int)strlen(text), XML_TRUE)
== XML_STATUS_ERROR)
xml_failure(g_parser);
}
END_TEST
/* Regression test for SF bug #616863. */
static int XMLCALL
external_entity_handler(XML_Parser parser, const XML_Char *context,
@ -5158,7 +5121,6 @@ make_suite(void) {
TCase *tc_accounting = tcase_create("accounting tests");
#endif
tcase_add_test(tc_namespace, test_start_ns_clears_start_element);
tcase_add_test__ifdef_xml_dtd(tc_namespace,
test_default_ns_from_ext_subset_and_ext_ge);
tcase_add_test(tc_namespace, test_ns_prefix_with_empty_uri_1);