diff options
| author | Nikita Popov <nikic@php.net> | 2016-08-30 10:54:31 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-08-30 10:54:31 +0200 |
| commit | 07cc6a6ba2d8cebe2b375353491a26953b250149 (patch) | |
| tree | d78a50442169fdec1fc998a5e836127505e26317 | |
| parent | b5f2f6fbd802ad3bc4fb37185e9e776bb089db56 (diff) | |
| download | php-git-07cc6a6ba2d8cebe2b375353491a26953b250149.tar.gz | |
Fix bug #72971
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 4 | ||||
| -rw-r--r-- | ext/simplexml/tests/bug72971.phpt | 21 |
3 files changed, 26 insertions, 2 deletions
@@ -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 3b27656786..7c1e68787c 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 0000000000..ff7ded02ef --- /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" +} |