Make test_alloc_parse_public_doctype() robust vs allocation changes

This commit is contained in:
Rhodri James 2017-07-27 13:35:48 +01:00
parent f82f7bf613
commit d75ac6bac2

View File

@ -8842,20 +8842,9 @@ START_TEST(test_alloc_parse_public_doctype)
"' 'test'>\n" "' 'test'>\n"
"<doc></doc>"; "<doc></doc>";
int i; int i;
#define MAX_ALLOC_COUNT 10 #define MAX_ALLOC_COUNT 25
int repeat = 0;
for (i = 0; i < MAX_ALLOC_COUNT; i++) { for (i = 0; i < MAX_ALLOC_COUNT; i++) {
/* Repeat certain counts to defeat cached allocations */
if (i == 4 && repeat == 5) {
i -= 2;
repeat++;
}
else if ((i == 2 && repeat < 3) ||
(i == 3 && repeat < 5)) {
i--;
repeat++;
}
allocation_count = i; allocation_count = i;
dummy_handler_flags = 0; dummy_handler_flags = 0;
XML_SetDoctypeDeclHandler(parser, XML_SetDoctypeDeclHandler(parser,
@ -8864,7 +8853,9 @@ START_TEST(test_alloc_parse_public_doctype)
if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),
XML_TRUE) != XML_STATUS_ERROR) XML_TRUE) != XML_STATUS_ERROR)
break; break;
XML_ParserReset(parser, NULL); /* See comment in test_alloc_parse_xdecl() */
alloc_teardown();
alloc_setup();
} }
if (i == 0) if (i == 0)
fail("Parse succeeded despite failing allocator"); fail("Parse succeeded despite failing allocator");