cheng/libexpat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make test_nsalloc_long_element() robust vs allocation pattern changes

Browse Source
This commit is contained in:
Rhodri James 2017-07-26 17:56:51 +01:00
parent c39b9a194b
commit b3853fee79
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
expat/tests/runtests.c
View File

@ -10830,26 +10830,9 @@ START_TEST(test_nsalloc_long_element)
"http://example.org/ a bar" "http://example.org/ a bar"
}; };
int i; int i;
#define MAX_ALLOC_COUNT 15 #define MAX_ALLOC_COUNT 30
int repeated = 0;
for (i = 0; i < MAX_ALLOC_COUNT; i++) { for (i = 0; i < MAX_ALLOC_COUNT; i++) {
/* Repeat some allocation counts because some allocations
* get cached across XML_ParserReset() called.
*/
if ((i == 4 && (repeated == 3 || repeated == 5)) ||
(i == 7 && repeated == 8) ||
(i == 10 && repeated == 9)) {
i -= 2;
repeated++;
}
else if ((i == 2 && repeated < 2) ||
(i == 3 &&
(repeated == 2 || repeated == 4 || repeated == 6)) ||
(i == 5 && repeated == 7)) {
i--;
repeated++;
}
allocation_count = i; allocation_count = i;
XML_SetReturnNSTriplet(parser, XML_TRUE); XML_SetReturnNSTriplet(parser, XML_TRUE);
XML_SetUserData(parser, elemstr); XML_SetUserData(parser, elemstr);
@ -10859,7 +10842,9 @@ START_TEST(test_nsalloc_long_element)
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_nsalloc_xmlns() */
nsalloc_teardown();
nsalloc_setup();
} }
if (i == 0) if (i == 0)
fail("Parsing worked despite failing reallocations"); fail("Parsing worked despite failing reallocations");