From d4e028c96af89ade493b440d4f2de6b684c03a06 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 17 May 2004 06:56:59 +0000 Subject: Load /tmp/tmp.QVLX5b/libxml2-2.6.10 into packages/libxml2/branches/upstream/current. --- xinclude.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xinclude.c') diff --git a/xinclude.c b/xinclude.c index 484cd6d..347e0ad 100644 --- a/xinclude.c +++ b/xinclude.c @@ -2194,7 +2194,7 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr tree) { 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 @@ xmlXIncludeDoProcess(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr tree) { 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)) -- cgit v1.2.3