php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix unsetting DOM properties

Browse Source 
This never did anything in lower versions, but on master this crashes
because the virtual properties don't have backing storage. Just forbid
it since it was useless to begin with.

Closes GH-15891.
This commit is contained in:
Niels Dossche
2024-09-14 22:47:24 +02:00
parent 31e2ec63d8
commit c9a4abadcc
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -10,6 +10,7 @@ PHP NEWS
. Fix XML serializer errata: xmlns="" serialization should be allowed.
(nielsdos)
. Fixed bug GH-15910 (Assertion failure in ext/dom/element.c). (nielsdos)
. Fix unsetting DOM properties. (nielsdos)
- MBString:
. Fixed bug GH-15824 (mb_detect_encoding(): Argument $encodings contains

13
ext/dom/php_dom.c
View File

@@ -478,6 +478,18 @@ static int dom_property_exists(zend_object *object, zend_string *name, int check
}
/* }}} */
static void dom_unset_property(zend_object *object, zend_string *member, void **cache_slot)
{
dom_object *obj = php_dom_obj_from_obj(object);
if (obj->prop_handler != NULL && zend_hash_exists(obj->prop_handler, member)) {
zend_throw_error(NULL, "Cannot unset %s::$%s", ZSTR_VAL(object->ce->name), ZSTR_VAL(member));
return;
}
zend_std_unset_property(object, member, cache_slot);
}
static HashTable* dom_get_debug_info_helper(zend_object *object, int *is_temp) /* {{{ */
{
dom_object *obj = php_dom_obj_from_obj(object);
@@ -755,6 +767,7 @@ PHP_MINIT_FUNCTION(dom)
dom_object_handlers.read_property = dom_read_property;
dom_object_handlers.write_property = dom_write_property;
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
dom_object_handlers.unset_property = dom_unset_property;
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
dom_object_handlers.has_property = dom_property_exists;
dom_object_handlers.get_debug_info = dom_get_debug_info;

32
ext/dom/tests/unsetting_properties.phpt Normal file
View File

@@ -0,0 +1,32 @@
--TEST--
Unsetting properties
--EXTENSIONS--
dom
--FILE--
<?php
class MyElement extends DOMElement {
public int $myProp = 3;
}
$dom = new DOMDocument;
$dom->registerNodeClass('DOMElement', 'MyElement');
$dom->loadXML('<root>foo</root>');
$root = $dom->documentElement;
unset($root->myProp);
try {
$root->myProp;
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
try {
unset($root->textContent);
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Typed property MyElement::$myProp must not be accessed before initialization
Cannot unset MyElement::$textContent