[libxml2] Fix "Problem with data in interleave in RelaxNG validation"



commit 7c4949afab383f07fc7ba467b6c24415ff8096e5
Author: Nikolai Weibull <now disu se>
Date:   Tue Jan 1 19:58:07 2019 +0100

    Fix "Problem with data in interleave in RelaxNG validation"
    
    Fixes commit c8e5f958.
    
    https://mail.gnome.org/archives/xml/2018-November/msg00029.html

 relaxng.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/relaxng.c b/relaxng.c
index ad803e17..914706ac 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -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);
         }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]