c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

testrecurse: Also test without entity substitution

Browse Source
This commit is contained in:
Nick Wellnhofer 2022-12-20 22:33:28 +01:00
parent 4c7cb8f4d4
commit 69aeff53c1
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
testrecurse.c
View File

@ -31,7 +31,8 @@
#define RD_FLAGS O_RDONLY #define RD_FLAGS O_RDONLY
#endif #endif
#define OPT_SAX (1<<0) #define OPT_SAX (1<<0)
#define OPT_NO_SUBST (1<<1)
typedef int (*functest) (const char *filename, const char *result, typedef int (*functest) (const char *filename, const char *result,
const char *error, int options); const char *error, int options);
@ -686,17 +687,19 @@ recursiveDetectTest(const char *filename,
xmlDocPtr doc; xmlDocPtr doc;
xmlParserCtxtPtr ctxt; xmlParserCtxtPtr ctxt;
int res = 0; int res = 0;
int parserOptions = XML_PARSE_DTDLOAD;
nb_tests++; nb_tests++;
ctxt = xmlNewParserCtxt(); ctxt = xmlNewParserCtxt();
if (options & OPT_SAX) if (options & OPT_SAX)
initSAX(ctxt); initSAX(ctxt);
if ((options & OPT_NO_SUBST) == 0)
parserOptions |= XML_PARSE_NOENT;
/* /*
* base of the test, parse with the old API * base of the test, parse with the old API
*/ */
doc = xmlCtxtReadFile(ctxt, filename, NULL, doc = xmlCtxtReadFile(ctxt, filename, NULL, parserOptions);
XML_PARSE_NOENT | XML_PARSE_DTDLOAD);
if ((doc != NULL) || (ctxt->lastError.code != XML_ERR_ENTITY_LOOP)) { if ((doc != NULL) || (ctxt->lastError.code != XML_ERR_ENTITY_LOOP)) {
fprintf(stderr, "Failed to detect recursion in %s\n", filename); fprintf(stderr, "Failed to detect recursion in %s\n", filename);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
@ -727,17 +730,19 @@ notRecursiveDetectTest(const char *filename,
xmlDocPtr doc; xmlDocPtr doc;
xmlParserCtxtPtr ctxt; xmlParserCtxtPtr ctxt;
int res = 0; int res = 0;
int parserOptions = XML_PARSE_DTDLOAD;
nb_tests++; nb_tests++;
ctxt = xmlNewParserCtxt(); ctxt = xmlNewParserCtxt();
if (options & OPT_SAX) if (options & OPT_SAX)
initSAX(ctxt); initSAX(ctxt);
if ((options & OPT_NO_SUBST) == 0)
parserOptions |= XML_PARSE_NOENT;
/* /*
* base of the test, parse with the old API * base of the test, parse with the old API
*/ */
doc = xmlCtxtReadFile(ctxt, filename, NULL, doc = xmlCtxtReadFile(ctxt, filename, NULL, parserOptions);
XML_PARSE_NOENT | XML_PARSE_DTDLOAD);
if (doc == NULL) { if (doc == NULL) {
fprintf(stderr, "Failed to parse correct file %s\n", filename); fprintf(stderr, "Failed to parse correct file %s\n", filename);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
@ -768,14 +773,16 @@ notRecursiveHugeTest(const char *filename ATTRIBUTE_UNUSED,
xmlParserCtxtPtr ctxt; xmlParserCtxtPtr ctxt;
xmlDocPtr doc; xmlDocPtr doc;
int res = 0; int res = 0;
int parserOptions = XML_PARSE_DTDLOAD;
nb_tests++; nb_tests++;
ctxt = xmlNewParserCtxt(); ctxt = xmlNewParserCtxt();
if (options & OPT_SAX) if (options & OPT_SAX)
initSAX(ctxt); initSAX(ctxt);
doc = xmlCtxtReadFile(ctxt, "huge:text", NULL, if ((options & OPT_NO_SUBST) == 0)
XML_PARSE_NOENT | XML_PARSE_DTDLOAD); parserOptions |= XML_PARSE_NOENT;
doc = xmlCtxtReadFile(ctxt, "huge:text", NULL, parserOptions);
if (doc == NULL) { if (doc == NULL) {
fprintf(stderr, "Failed to parse huge:test with entities\n"); fprintf(stderr, "Failed to parse huge:test with entities\n");
res = 1; res = 1;
@ -839,9 +846,15 @@ testDesc testDescriptions[] = {
{ "Parsing recursive test cases" , { "Parsing recursive test cases" ,
recursiveDetectTest, "./test/recurse/lol*.xml", NULL, NULL, NULL, recursiveDetectTest, "./test/recurse/lol*.xml", NULL, NULL, NULL,
0 }, 0 },
{ "Parsing recursive test cases (no substitution)" ,
recursiveDetectTest, "./test/recurse/lol*.xml", NULL, NULL, NULL,
OPT_NO_SUBST },
{ "Parsing recursive test cases (SAX)" , { "Parsing recursive test cases (SAX)" ,
recursiveDetectTest, "./test/recurse/lol*.xml", NULL, NULL, NULL, recursiveDetectTest, "./test/recurse/lol*.xml", NULL, NULL, NULL,
OPT_SAX }, OPT_SAX },
{ "Parsing recursive test cases (SAX, no substitution)" ,
recursiveDetectTest, "./test/recurse/lol*.xml", NULL, NULL, NULL,
OPT_SAX | OPT_NO_SUBST },
{ "Parsing non-recursive test cases" , { "Parsing non-recursive test cases" ,
notRecursiveDetectTest, "./test/recurse/good*.xml", NULL, NULL, NULL, notRecursiveDetectTest, "./test/recurse/good*.xml", NULL, NULL, NULL,
0 }, 0 },
@ -851,9 +864,15 @@ testDesc testDescriptions[] = {
{ "Parsing non-recursive huge case" , { "Parsing non-recursive huge case" ,
notRecursiveHugeTest, NULL, NULL, NULL, NULL, notRecursiveHugeTest, NULL, NULL, NULL, NULL,
0 }, 0 },
{ "Parsing non-recursive huge case (no substitution)" ,
notRecursiveHugeTest, NULL, NULL, NULL, NULL,
OPT_NO_SUBST },
{ "Parsing non-recursive huge case (SAX)" , { "Parsing non-recursive huge case (SAX)" ,
notRecursiveHugeTest, NULL, NULL, NULL, NULL, notRecursiveHugeTest, NULL, NULL, NULL, NULL,
OPT_SAX }, OPT_SAX },
{ "Parsing non-recursive huge case (SAX, no substitution)" ,
notRecursiveHugeTest, NULL, NULL, NULL, NULL,
OPT_SAX | OPT_NO_SUBST },
{NULL, NULL, NULL, NULL, NULL, NULL, 0} {NULL, NULL, NULL, NULL, NULL, NULL, 0}
}; };