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

Fix --with-valid --without-regexps build

Browse Source 
This build config resulted in segfaults in 'runtest'  because a special
xmlElementContentPtr showed up in a few places. I'm not sure if this is
the right fix.

An error message was changed to conform to the --with-regexps build.

There are still a few missing validity errors, so the tests don't pass.
This commit is contained in:
Nick Wellnhofer 2022-09-01 23:15:35 +02:00
parent 884e142dc5
commit c714979293
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
result/VC/ElementValid8
View File

@ -1,3 +1,3 @@
./test/VC/ElementValid8:7: validity error : Content model of doc is not determinist: ((a , b) | (a , c)) ./test/VC/ElementValid8:7: validity error : Content model of doc is not deterministic: ((a , b) | (a , c))
<doc><a/><c> doc is non-deterministic </c></doc> <doc><a/><c> doc is non-deterministic </c></doc>
^ ^

2
result/VC/ElementValid8.rdr
View File

@ -1,3 +1,3 @@
./test/VC/ElementValid8:7: validity error : Content model of doc is not determinist: ((a , b) | (a , c)) ./test/VC/ElementValid8:7: validity error : Content model of doc is not deterministic: ((a , b) | (a , c))
<doc><a/><c> doc is non-deterministic </c></doc> <doc><a/><c> doc is non-deterministic </c></doc>
^ ^

18
valid.c
View File

@ -835,7 +835,7 @@ xmlValidBuildContentModel(xmlValidCtxtPtr ctxt, xmlElementPtr elem) {
xmlSnprintfElementContent(expr, 5000, elem->content, 1); xmlSnprintfElementContent(expr, 5000, elem->content, 1);
xmlErrValidNode(ctxt, (xmlNodePtr) elem, xmlErrValidNode(ctxt, (xmlNodePtr) elem,
XML_DTD_CONTENT_NOT_DETERMINIST, XML_DTD_CONTENT_NOT_DETERMINIST,
"Content model of %s is not determinist: %s\n", "Content model of %s is not deterministic: %s\n",
elem->name, BAD_CAST expr, NULL); elem->name, BAD_CAST expr, NULL);
#ifdef DEBUG_REGEXP_ALGO #ifdef DEBUG_REGEXP_ALGO
xmlRegexpPrint(stderr, elem->contModel); xmlRegexpPrint(stderr, elem->contModel);
@ -4906,6 +4906,7 @@ cont:
*/ */
if ((CONT != NULL) && if ((CONT != NULL) &&
((CONT->parent == NULL) || ((CONT->parent == NULL) ||
(CONT->parent == (xmlElementContentPtr) 1) ||
(CONT->parent->type != XML_ELEMENT_CONTENT_OR)) && (CONT->parent->type != XML_ELEMENT_CONTENT_OR)) &&
((CONT->ocur == XML_ELEMENT_CONTENT_MULT) || ((CONT->ocur == XML_ELEMENT_CONTENT_MULT) ||
(CONT->ocur == XML_ELEMENT_CONTENT_OPT) || (CONT->ocur == XML_ELEMENT_CONTENT_OPT) ||
@ -5158,7 +5159,8 @@ analyze:
* Then act accordingly at the parent level * Then act accordingly at the parent level
*/ */
RESET_OCCURRENCE; RESET_OCCURRENCE;
if (CONT->parent == NULL) if ((CONT->parent == NULL) ||
(CONT->parent == (xmlElementContentPtr) 1))
break; break;
switch (CONT->parent->type) { switch (CONT->parent->type) {
@ -5440,9 +5442,13 @@ fail:
STATE = 0; STATE = 0;
ret = xmlValidateElementType(ctxt); ret = xmlValidateElementType(ctxt);
if ((ret == -3) && (warn)) { if ((ret == -3) && (warn)) {
xmlErrValidWarning(ctxt, child, XML_DTD_CONTENT_NOT_DETERMINIST, char expr[5000];
"Content model for Element %s is ambiguous\n", expr[0] = 0;
name, NULL, NULL); xmlSnprintfElementContent(expr, 5000, elemDecl->content, 1);
xmlErrValidNode(ctxt, (xmlNodePtr) elemDecl,
XML_DTD_CONTENT_NOT_DETERMINIST,
"Content model of %s is not deterministic: %s\n",
name, BAD_CAST expr, NULL);
} else if (ret == -2) { } else if (ret == -2) {
/* /*
* An entities reference appeared at this level. * An entities reference appeared at this level.
@ -5663,6 +5669,7 @@ done:
return(ret); return(ret);
} }
#ifdef LIBXML_REGEXP_ENABLED
/** /**
* xmlValidateCheckMixed: * xmlValidateCheckMixed:
* @ctxt: the validation context * @ctxt: the validation context
@ -5728,6 +5735,7 @@ xmlValidateCheckMixed(xmlValidCtxtPtr ctxt,
} }
return(0); return(0);
} }
#endif /* LIBXML_REGEXP_ENABLED */
/** /**
* xmlValidGetElemDecl: * xmlValidGetElemDecl: