commit 7c4949afab383f07fc7ba467b6c24415ff8096e5
author Nikolai Weibull <now@disu.se> Tue Jan 01 19:58:07 2019 +0100
committer Nick Wellnhofer <wellnhofer@aevum.de> Tue Jan 01 20:02:36 2019 +0100
tree 0fdb0e31369597731f8fe98efc61c69aaf7d560d
parent 6fc04d714a019cb3be351bc472f7a64a08f51008

Fix "Problem with data in interleave in RelaxNG validation"

Fixes commit c8e5f958.

https://mail.gnome.org/archives/xml/2018-November/msg00029.html

relaxng.c

diff --git a/relaxng.c b/relaxng.c
index ad803e1..914706a 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -4023,8 +4023,8 @@
             ((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 @@
                 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);
         }