Skip to content

Fix GH-12171: resolve SimpleXML nodes before equality compare #23187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+31 −1
Open

Fix GH-12171: resolve SimpleXML nodes before equality compare #23187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.25

- SimpleXML:
. Fixed bug GH-12171 (SimpleXML property-proxy equality ignores element
names). (iliaal)

- Date:
. Fixed leak on double DatePeriod::__construct() call. (ilutov)

Expand Down
5 changes: 4 additions & 1 deletion ext/simplexml/simplexml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,8 +1220,11 @@ static int sxe_objects_compare(zval *object1, zval *object2) /* {{{ */
sxe2 = Z_SXEOBJ_P(object2);

if (sxe1->node != NULL && sxe2->node != NULL) {
xmlNodePtr node1 = php_sxe_get_first_node_non_destructive(sxe1, sxe1->node->node);
xmlNodePtr node2 = php_sxe_get_first_node_non_destructive(sxe2, sxe2->node->node);

/* Both nodes set: Only support equality comparison between nodes. */
if (sxe1->node == sxe2->node) {
if (node1 && node1 == node2) {
return 0;
}
return ZEND_UNCOMPARABLE;
Expand Down
23 changes: 23 additions & 0 deletions ext/simplexml/tests/gh12171.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
GH-12171 (SimpleXML property-proxy equality must resolve iterator nodes)
--EXTENSIONS--
simplexml
--FILE--
<?php
$xml = simplexml_load_string('<root><first/><second/><third/></root>');
echo "first==second: ";
var_dump($xml->first == $xml->second);
echo "first==first: ";
var_dump($xml->first == $xml->first);
echo "first==root: ";
var_dump($xml->first == $xml);
$a = $xml->first;
$b = $xml->first;
echo "proxies equal: ";
var_dump($a == $b);
?>
--EXPECT--
first==second: bool(false)
first==first: bool(true)
first==root: bool(false)
proxies equal: bool(true)
Loading