com php-src: Fix bug #72971: NEWS ext/simplexml/simplexml.c ext/simplexml/tests/bug72971.phpt

From: Date: Tue, 30 Aug 2016 08:54:31 +0000
Subject: com php-src: Fix bug #72971: NEWS ext/simplexml/simplexml.c ext/simplexml/tests/bug72971.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94149@lists.php.net to get a copy of this message
Commit: 07cc6a6ba2d8cebe2b375353491a26953b250149 Author: Nikita Popov <nikic@php.net> Tue, 30 Aug 2016 10:54:31 +0200 Parents: b5f2f6fbd802ad3bc4fb37185e9e776bb089db56 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=07cc6a6ba2d8cebe2b375353491a26953b250149 Log: Fix bug #72971 Bugs: https://bugs.php.net/72971 Changed paths: M NEWS M ext/simplexml/simplexml.c A ext/simplexml/tests/bug72971.phpt Diff: diff --git a/NEWS b/NEWS index 3bc47ec..5e7c690 100644 --- a/NEWS +++ b/NEWS @@ -76,6 +76,9 @@ PHP NEWS . Fixed bug #72940 (SID always return "name=ID", even if session cookie exist). (Yasuo) +- SimpleXML: + . Fixed bug #72971 (SimpleXML isset/unset do not respect namespace). (Nikita) + - Standard: . Fixed bug #55451 (substr_compare NULL length interpreted as 0). (Lauri Kenttä) diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 3b27656..7c1e687 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -807,7 +807,7 @@ static int sxe_prop_dim_exists(zval *object, zval *member, int check_empty, zend while (node) { xmlNodePtr nnext; nnext = node->next; - if ((node->type == XML_ELEMENT_NODE) && !xmlStrcmp(node->name, (xmlChar *)Z_STRVAL_P(member))) { + if (node->type == XML_ELEMENT_NODE && !xmlStrcmp(node->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) { break; } node = nnext; @@ -937,7 +937,7 @@ static void sxe_prop_dim_delete(zval *object, zval *member, zend_bool elements, SKIP_TEXT(node); - if (!xmlStrcmp(node->name, (xmlChar *)Z_STRVAL_P(member))) { + if (!xmlStrcmp(node->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) { xmlUnlinkNode(node); php_libxml_node_free_resource(node); } diff --git a/ext/simplexml/tests/bug72971.phpt b/ext/simplexml/tests/bug72971.phpt new file mode 100644 index 0000000..ff7ded0 --- /dev/null +++ b/ext/simplexml/tests/bug72971.phpt @@ -0,0 +1,21 @@ +--TEST-- +Bug #72971: SimpleXML isset/unset do not respect namespace +--SKIPIF-- +<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?> +--FILE-- +<?php + +$xml = new SimpleXMLElement('<root xmlns:ns="ns"><foo>bar</foo><ns:foo>ns:bar</ns:foo><ns:foo2>ns:bar2</ns:foo2></root>'); +var_dump(isset($xml->foo2)); +unset($xml->foo); +var_dump($xml->children('ns')); + +?> +--EXPECT-- +bool(false) +object(SimpleXMLElement)#2 (2) { + ["foo"]=> + string(6) "ns:bar" + ["foo2"]=> + string(7) "ns:bar2" +}

« previous php.cvs (#94149) next »