[php-src] master: Merge branch 'PHP-7.3' into PHP-7.4

Author: Stanislav Malyshev (smalyshev) Date: 2021-04-26T21:02:03-07:00 Commit: https://github.com/php/php-src/commit/2b3346208acd01567d0f39a6f382ee58f54c2225 Raw diff: https://github.com/php/php-src/commit/2b3346208acd01567d0f39a6f382ee58f54c2225.diff Merge branch 'PHP-7.3' into PHP-7.4 * PHP-7.3: Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement" Changed paths: D ext/simplexml/tests/bug80852.phpt M ext/simplexml/simplexml.c Diff: diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index f03bf2bebde2..2cdff0e648d7 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1211,7 +1211,7 @@ static HashTable *sxe_get_prop_hash(zval *object, int is_debug) /* {{{ */ } } - if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) || node->type == XML_ENTITY_DECL) { + if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix))) { goto next_iter; } @@ -1908,7 +1908,7 @@ static int sxe_object_cast_ex(zval *readobj, zval *writeobj, int type) if (sxe->node && sxe->node->node) { if (sxe->node->node->children) { - contents = xmlNodeListGetRawString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1); + contents = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1); } } } diff --git a/ext/simplexml/tests/bug80852.phpt b/ext/simplexml/tests/bug80852.phpt deleted file mode 100644 index abda2deda1e1..000000000000 --- a/ext/simplexml/tests/bug80852.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Bug #80852 (Stack-overflow when json_encode()'ing SimpleXMLElement) ---SKIPIF-- -<?php -if (!extension_loaded('simplexml')) die('skip simplexml extension not available'); -if (!extension_loaded('json')) die('skip json extension not available'); -?> ---FILE-- -<?php -$xml = '<!DOCTYPE foo [<!ENTITY xee1 "aaa"> <!ENTITY xee2 "&xee1;&xee1;"> ]><a>b&xee2;</a>'; -$sxe = simplexml_load_string($xml); -var_dump(json_encode($sxe)); -var_dump($sxe); -?> ---EXPECT-- -string(11) "{"xee2":{}}" -object(SimpleXMLElement)#1 (1) { - ["xee2"]=> - object(SimpleXMLElement)#3 (0) { - } -}