a little further fixing of fallback processing, this time for fallback
* xinclude.c: a little further fixing of fallback processing, this
time for fallback with children (bug 139520).
diff --git a/xinclude.c b/xinclude.c
index 484cd6d..347e0ad 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -2194,7 +2194,7 @@
cur = tree;
if (xmlXIncludeTestNode(ctxt, cur) == 1)
xmlXIncludePreProcessNode(ctxt, cur);
- while (cur != NULL) {
+ while ((cur != NULL) && (cur != tree->parent)) {
/* TODO: need to work on entities -> stack */
if ((cur->children != NULL) &&
(cur->children->type != XML_ENTITY_DECL) &&
@@ -2212,7 +2212,8 @@
break;
do {
cur = cur->parent;
- if (cur == NULL) break; /* do */
+ if ((cur == NULL) || (cur == tree->parent))
+ break; /* do */
if (cur->next != NULL) {
cur = cur->next;
if (xmlXIncludeTestNode(ctxt, cur))