Fix bug #43364 (recursive xincludes don't remove internal nodes properly)

Rob Richards · Rob Richards · commit b73a36a64f1a · 2007-11-28T10:43:02.000Z
diff --git a/ext/dom/document.c b/ext/dom/document.c
@@ -1767,6 +1767,10 @@ static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) {
 
 			/* XML_XINCLUDE_END node will be a sibling of XML_XINCLUDE_START */
 			while(cur && cur->type != XML_XINCLUDE_END) {
+				/* remove xinclude processing nodes from recursive xincludes */
+				if (cur->type == XML_ELEMENT_NODE) {
+					   php_dom_remove_xinclude_nodes(cur->children TSRMLS_CC);
+				}
 				cur = cur->next;
 			}
 
diff --git a/ext/dom/tests/bug43364.phpt b/ext/dom/tests/bug43364.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #43364 (recursive xincludes don't remove internal xml nodes properly)
+--FILE--
+<?php 
+function loopElements($nodes)
+{
+    $count = 0;
+    foreach($nodes as $node) {
+        if($node instanceof DOMElement) {
+            $count++;
+            if($node->childNodes->length > 0) {
+                $count += loopElements($node->childNodes);
+            }
+        }
+    }
+    return $count;
+}
+
+$xml = <<<DOC
+<?xml version="1.0" encoding="UTF-8"?>
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+    <a>
+        <a_child1>ac1</a_child1>
+        <a_child2>ac2</a_child2>
+    </a>
+    <b><xi:include xpointer="xpointer(/root/a)" /></b>
+    <c><xi:include xpointer="xpointer(/root/b)" /></c>
+</root>
+DOC;
+
+$doc = new DomDocument();
+$doc->loadXml($xml);
+$doc->xinclude();
+
+$count = loopElements(array($doc->documentElement));
+
+var_dump($count);
+?>
+--EXPECT--
+int(13)

Original file line number	Diff line number	Diff line change
`@@ -1767,6 +1767,10 @@ static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) {`
`1767`	`1767`
`1768`	`1768`	`/* XML_XINCLUDE_END node will be a sibling of XML_XINCLUDE_START */`
`1769`	`1769`	`while(cur && cur->type != XML_XINCLUDE_END) {`
	`1770`	`+ /* remove xinclude processing nodes from recursive xincludes */`
	`1771`	`+ if (cur->type == XML_ELEMENT_NODE) {`
	`1772`	`+ php_dom_remove_xinclude_nodes(cur->children TSRMLS_CC);`
	`1773`	`+ }`
`1770`	`1774`	`cur = cur->next;`
`1771`	`1775`	`}`
`1772`	`1776`