Fixed bug #41374 (wholetext concats values of wrong nodes).

add test

2 files changed, 49 insertions, 3 deletions

diff --git a/ext/dom/tests/bug41374.phpt b/ext/dom/tests/bug41374.phpt
new file mode 100644
index 0000000000..6de5ffbc05
--- /dev/null
+++ b/ext/dom/tests/bug41374.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Bug # 41374: (wholetext concats values of wrong nodes)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$xml = (binary)<<<EOXML
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<root>foo<child />baz</root>
+EOXML;
+
+$doc = new DOMDocument();
+$doc->loadXML($xml);
+
+$root = $doc->documentElement;
+$foo = $root->firstChild;
+
+var_dump($foo->wholeText == "foo");
+
+$bar = $root->insertBefore($doc->createTextNode("bar"), $foo->nextSibling);
+
+var_dump($foo->wholeText == "foobar");
+var_dump($foo->wholeText == $bar->wholeText);
+$baz = $bar->nextSibling->nextSibling;
+
+var_dump($baz->wholeText === $foo->wholeText);
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(false)
diff --git a/ext/dom/text.c b/ext/dom/text.c
index aaac4963b5..e0458fb328 100644
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -87,7 +87,7 @@ Since: DOM Level 3
 int dom_text_whole_text_read(dom_object *obj, zval **retval TSRMLS_DC)
 {
 	xmlNodePtr node;
-	xmlChar *wholetext;
+	xmlChar *wholetext = NULL;
 
 	node = dom_object_get_node(obj);
 
@@ -96,9 +96,23 @@ int dom_text_whole_text_read(dom_object *obj, zval **retval TSRMLS_DC)
 		return FAILURE;
 	}
 
+	/* Find starting text node */
+	while (node->prev && ((node->prev->type == XML_TEXT_NODE) || (node->prev->type == XML_CDATA_SECTION_NODE))) {
+		node = node->prev;
+	}
+
+	/* concatenate all adjacent text and cdata nodes */
+	while (node && ((node->type == XML_TEXT_NODE) || (node->type == XML_CDATA_SECTION_NODE))) {
+		wholetext = xmlStrcat(wholetext, node->content);
+		node = node->next;
+	}
+
 	ALLOC_ZVAL(*retval);
-	wholetext = xmlNodeListGetString(node->doc, node, 1);
-	ZVAL_STRING(*retval, wholetext, 1);
+	if (wholetext != NULL) {
+		ZVAL_STRING(*retval, wholetext, 1);
+	} else {
+		ZVAL_EMPTY_STRING(*retval);
+	}
 
 	xmlFree(wholetext);