From: Rhodri James <rhodri@kynesim.co.uk>
Date: Thu, 27 Jul 2017 11:10:00 +0000 (+0100)
Subject: Make test_alloc_parse_pi_2() robust vs allocation pattern changes
X-Git-Tag: R_2_2_3~16^2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c68d5f3e144a842e85af08657f992e1696d2a5e;p=libexpat

Make test_alloc_parse_pi_2() robust vs allocation pattern changes
---

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index d20d6d1c..49f10127 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -7972,25 +7972,17 @@ START_TEST(test_alloc_parse_pi_2)
         "<?pi unknown?>\n"
         "</doc>";
     int i;
-    int repeat = 0;
-#define MAX_ALLOC_COUNT 10
+#define MAX_ALLOC_COUNT 15
 
     for (i = 0; i < MAX_ALLOC_COUNT; i++) {
         allocation_count = i;
-        /* Repeat some counts because of cached memory */
-        if (i == 2 && repeat == 1) {
-            i -= 2;
-            repeat++;
-        } else if ((i == 1 && repeat < 1) ||
-                   (i == 1 && repeat > 1 && repeat < 4)) {
-            i--;
-            repeat++;
-        }
         XML_SetProcessingInstructionHandler(parser, dummy_pi_handler);
         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("Parse succeeded despite failing allocator");