Skip to content

ext/dom: fix UAF on namespace axis results with foreign-doc XPath cal… #24629

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
devnexen wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+37 −1
Open

ext/dom: fix UAF on namespace axis results with foreign-doc XPath cal… #24629

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
36 changes: 36 additions & 0 deletions ext/dom/tests/xpath_php_function_foreign_doc_namespace_axis.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
DOMXPath: namespace axis result on a node from a document created inside an XPath callback
--EXTENSIONS--
dom
--FILE--
<?php

$doc = new DOMDocument;
$doc->loadXML('<root/>');

$xp = new DOMXPath($doc);
$xp->registerNamespace('my', 'my.ns');
$xp->registerPHPFunctionNS('my.ns', 'include', function () {
$d = new DOMDocument;
$d->loadXML('<r><uaf xmlns:a="urn:a"/></r>');
return $d->documentElement;
});

$result = $xp->query('my:include()/uaf/namespace::*');
var_dump($result->length);
unset($xp);

foreach ($result as $ns) {
var_dump($ns->nodeName, $ns->parentNode->nodeName);
}

echo "Done\n";

?>
--EXPECT--
int(2)
string(9) "xmlns:xml"
string(3) "uaf"
string(7) "xmlns:a"
string(3) "uaf"
Done
2 changes: 1 addition & 1 deletion ext/dom/xpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type, bool modern)

/* Make sure parent dom object exists, so we can take an extra reference. */
zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */
php_dom_create_object(nsparent, &parent_zval, &intern->dom);
php_dom_create_object(nsparent, &parent_zval, dom_xpath_intern_for_doc(intern, nsparent->doc));
dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval);

node = php_dom_create_fake_namespace_decl(nsparent, original, &child, parent_intern);
Expand Down
Loading