Skip to content

Commit 1b88c85

Browse files
committed
Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"
Sorry, this solution seems to have BC breaks, will need to look for better one. This reverts commit 9f7e8b7.
1 parent 9f7e8b7 commit 1b88c85

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
@@ -1192,7 +1192,7 @@ static HashTable *sxe_get_prop_hash(zval *object, int is_debug) /* {{{ */
11921192
}
11931193
}
11941194

1195-
if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) || node->type == XML_ENTITY_DECL) {
1195+
if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix))) {
11961196
goto next_iter;
11971197
}
11981198

@@ -1889,7 +1889,7 @@ static int sxe_object_cast_ex(zval *readobj, zval *writeobj, int type)
18891889

18901890
if (sxe->node && sxe->node->node) {
18911891
if (sxe->node->node->children) {
1892-
contents = xmlNodeListGetRawString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1);
1892+
contents = xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, sxe->node->node->children, 1);
18931893
}
18941894
}
18951895
}

ext/simplexml/tests/bug80852.phpt

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

0 commit comments

Comments
 (0)