Make test_alloc_long_public_id() robust vs allocation pattern changes
@@ -10046,21 +10046,9 @@ START_TEST(test_alloc_long_public_id)
"<doc>&e;</doc>";
char entity_text[] = "Hello world";
int i;
-#define MAX_ALLOC_COUNT 20
- int repeat = 0;
+#define MAX_ALLOC_COUNT 40
for (i = 0; i < MAX_ALLOC_COUNT; i++) {
- /* Repeat certain counts to defeat allocation caching */
- if (i == 4 && repeat == 4) {
- i -= 2;
- repeat++;
- }
- else if ((i == 2 && repeat < 3) ||
- (i == 3 && (repeat == 3 || repeat == 5)) ||
- (i == 4 && repeat == 6)) {
- i--;
- repeat++;
- }
allocation_count = i;
XML_SetUserData(parser, entity_text);
XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);
@@ -10068,7 +10056,9 @@ START_TEST(test_alloc_long_public_id)
if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),
XML_TRUE) != XML_STATUS_ERROR)
break;
- XML_ParserReset(parser, NULL);
+ /* See comment in test_alloc_parse_xdecl() */
+ alloc_teardown();
+ alloc_setup();
}
if (i == 0)
fail("Parsing worked despite failing allocations");
