archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-16316: DOMXPath breaks when not initialized properly
This commit is contained in:
Niels Dossche 2024-10-10 19:29:22 +02:00
commit c597f92be9
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ext/dom/tests/gh16316.phpt Normal file
View file

@ -0,0 +1,32 @@
--TEST--
GH-16316 (DOMXPath breaks when not initialized properly)
--EXTENSIONS--
dom
--FILE--
<?php
class Demo extends DOMXPath {
public function __construct() {}
}
$demo = new Demo;
try {
var_dump($demo);
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
try {
var_dump($demo->document);
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
object(Demo)#1 (1) {
["registerNodeNamespaces"]=>
bool(true)
}
Invalid State Error
Invalid State Error

5
ext/dom/xpath.c
View file

@ -178,6 +178,11 @@ zend_result dom_xpath_document_read(dom_object *obj, zval *retval)
docp = (xmlDocPtr) ctx->doc;
}
if (UNEXPECTED(!docp)) {
php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
return FAILURE;
}
php_dom_create_object((xmlNodePtr) docp, retval, obj);
return SUCCESS;
}