Browse Source

fix bug #46047 (SimpleXML converts empty nodes into object with nested array)

add test
experimental/first_unicode_implementation
Rob Richards 18 years ago
parent
commit
5f50350ca9
  1. 18
      ext/simplexml/simplexml.c
  2. 48
      ext/simplexml/tests/bug46047.phpt

18
ext/simplexml/simplexml.c

@ -1142,13 +1142,17 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
SKIP_TEXT(node);
} else {
if (node->type == XML_TEXT_NODE) {
xmlChar *tmp;
MAKE_STD_ZVAL(value);
tmp = xmlNodeListGetString(node->doc, node, 1);
ZVAL_XML_STRING(value, (char *)tmp, ZSTR_DUPLICATE);
xmlFree(tmp);
zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
const xmlChar *cur = node->content;
if (*cur != 0) {
xmlChar *tmp;
MAKE_STD_ZVAL(value);
tmp = xmlNodeListGetString(node->doc, node, 1);
ZVAL_XML_STRING(value, (char *)tmp, ZSTR_DUPLICATE);
xmlFree(tmp);
zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
}
goto next_iter;
}
}

48
ext/simplexml/tests/bug46047.phpt

@ -0,0 +1,48 @@
--TEST--
Bug #46047 (SimpleXML converts empty nodes into object with nested array)
--FILE--
<?php
$xml = new SimpleXMLElement('<foo><bar><![CDATA[]]></bar><baz/></foo>',
LIBXML_NOCDATA);
print_r($xml);
$xml = new SimpleXMLElement('<foo><bar></bar><baz/></foo>');
print_r($xml);
$xml = new SimpleXMLElement('<foo><bar/><baz/></foo>');
print_r($xml);
?>
--EXPECTF--
SimpleXMLElement Object
(
[bar] => SimpleXMLElement Object
(
)
[baz] => SimpleXMLElement Object
(
)
)
SimpleXMLElement Object
(
[bar] => SimpleXMLElement Object
(
)
[baz] => SimpleXMLElement Object
(
)
)
SimpleXMLElement Object
(
[bar] => SimpleXMLElement Object
(
)
[baz] => SimpleXMLElement Object
(
)
)
Loading…
Cancel
Save