1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-21 22:50:08 +03:00

Fix "Problem with data in interleave in RelaxNG validation"

Fixes commit c8e5f958.

https://mail.gnome.org/archives/xml/2018-November/msg00029.html
This commit is contained in:
Nikolai Weibull 2019-01-01 19:58:07 +01:00 committed by Nick Wellnhofer
parent 6fc04d714a
commit 7c4949afab

View File

@ -4023,8 +4023,8 @@ xmlRelaxNGGetElements(xmlRelaxNGParserCtxtPtr ctxt,
((eora == 2) && ((cur->type == XML_RELAXNG_DATATYPE) ||
(cur->type == XML_RELAXNG_ELEMENT) ||
(cur->type == XML_RELAXNG_LIST) ||
(cur->type == XML_RELAXNG_TEXT) ||
(cur->type == XML_RELAXNG_VALUE)))) {
if (ret == NULL) {
max = 10;
ret = (xmlRelaxNGDefinePtr *)
@ -9285,9 +9285,9 @@ xmlRelaxNGNodeMatchesList(xmlNodePtr node, xmlRelaxNGDefinePtr * list)
return (1);
} else if (((node->type == XML_TEXT_NODE) ||
(node->type == XML_CDATA_SECTION_NODE)) &&
((cur->type == XML_RELAXNG_TEXT) ||
(cur->type == XML_RELAXNG_DATATYPE) ||
((cur->type == XML_RELAXNG_DATATYPE) ||
(cur->type == XML_RELAXNG_LIST) ||
(cur->type == XML_RELAXNG_TEXT) ||
(cur->type == XML_RELAXNG_VALUE))) {
return (1);
}