Skip to content

Commit 476888d

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"
2 parents 833fac3 + eed03fc commit 476888d

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

ext/simplexml/simplexml.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ static HashTable *sxe_get_prop_hash(zend_object *object, int is_debug) /* {{{ */
11721172
}
11731173
}
11741174

1175-
if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) || node->type == XML_ENTITY_DECL) {
1175+
if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix))) {
11761176
goto next_iter;
11771177
}
11781178

@@ -1871,7 +1871,7 @@ static int sxe_object_cast_ex(zend_object *readobj, zval *writeobj, int type)
18711871

18721872
if (sxe->node && sxe->node->node) {
18731873
if (sxe->node->node->children) {
1874-
contents = xmlNodeListGetRawString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1);
1874+
contents = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1);
18751875
}
18761876
}
18771877
}

ext/simplexml/tests/bug80852.phpt

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)