MFB: fix bug #41947 (SimpleXML incorrectly registers empty strings as namespaces

add test

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 9b60779b6f5d4d1d05af05b309087b9bf14c72ab..d60f7a27ec2565ec4bf9d767481b4339b84e3f85 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1633,11 +1633,16 @@ SXE_METHOD(addChild)
        newnode = xmlNewChild(node, NULL, localname, (xmlChar *)value);
 
        if (nsuri != NULL) {
-               nsptr = xmlSearchNsByHref(node->doc, node, (xmlChar *)nsuri);
-               if (nsptr == NULL) {
+               if (nsuri_len == 0) {
+                       newnode->ns = NULL;
                        nsptr = xmlNewNs(newnode, (xmlChar *)nsuri, prefix);
+               } else {
+                       nsptr = xmlSearchNsByHref(node->doc, node, (xmlChar *)nsuri);
+                       if (nsptr == NULL) {
+                               nsptr = xmlNewNs(newnode, (xmlChar *)nsuri, prefix);
+                       }
+                       newnode->ns = nsptr;
                }
-               newnode->ns = nsptr;
        }
 
        _node_as_zval(sxe, newnode, return_value, SXE_ITER_NONE, (char *)localname, prefix, 0 TSRMLS_CC);

diff --git a/ext/simplexml/tests/bug41947.phpt b/ext/simplexml/tests/bug41947.phpt
new file mode 100644 (file)
index 0000000..7af9ff8
--- /dev/null
+++ b/ext/simplexml/tests/bug41947.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #41947 (addChild incorrectly registers empty strings as namespaces)
+--FILE--
+<?php
+$xml = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><root xmlns:myns="http://myns" />');
+$grandchild = $xml->addChild('child', null, 'http://myns')->addChild('grandchild', 'hello', '');
+
+$gchild = $xml->xpath("//grandchild");
+if (count($gchild) > 0) {
+    echo $gchild[0];
+}
+?>
+--EXPECT--
+hello