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

ReflectionProperty::get{Hook,Hooks}(): handle dynamic properties

Browse Source 
For dynamic properties, instead of crashing with a segmentation fault, just say
that there are no hooks. Also includes a test to prevent regression.

Fixes GH-15718
Closes GH-15721
This commit is contained in:
Daniel Scherzer
2024-09-02 23:02:40 -07:00
committed by Ilija Tovilo
parent a7f789ec56
commit 18df69ee34
3 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -16,6 +16,8 @@ PHP NEWS
property. (ilutov)
. Fixed bug GH-15693 (Unnecessary include in main.c bloats binary).
(nielsdos)
. Fixed bug GH-15718 (Segfault on ReflectionProperty::get{Hook,Hooks}() on
dynamic properties). (DanielEScherzer)
- DOM:
. Fixed bug GH-13988 (Storing DOMElement consume 4 times more memory in

12
ext/reflection/php_reflection.c
View File

@@ -6505,7 +6505,8 @@ ZEND_METHOD(ReflectionProperty, getHooks)
GET_REFLECTION_OBJECT_PTR(ref);
if (!ref->prop->hooks) {
// ref->prop can be missing for dynamic properties
if (!ref->prop || !ref->prop->hooks) {
RETURN_EMPTY_ARRAY();
}
@@ -6536,11 +6537,16 @@ ZEND_METHOD(ReflectionProperty, getHook)
GET_REFLECTION_OBJECT_PTR(ref);
// ref->prop can be missing for dynamic properties
if (!ref->prop || !ref->prop->hooks) {
RETURN_NULL();
}
zend_function *hook;
if (zend_string_equals_literal(Z_STR_P(zend_enum_fetch_case_name(type)), "Get")) {
hook = ref->prop->hooks ? ref->prop->hooks[ZEND_PROPERTY_HOOK_GET] : NULL;
hook = ref->prop->hooks[ZEND_PROPERTY_HOOK_GET];
} else {
hook = ref->prop->hooks ? ref->prop->hooks[ZEND_PROPERTY_HOOK_SET] : NULL;
hook = ref->prop->hooks[ZEND_PROPERTY_HOOK_SET];
}
if (!hook) {

48
ext/reflection/tests/property_hooks/gh15718.phpt Normal file
View File

@@ -0,0 +1,48 @@
--TEST--
ReflectionProperty::get{Hook,Hooks}() crashes on dynamic properties
--FILE--
<?php
#[\AllowDynamicProperties]
class MyDynamicClass {
}
class NonDynamicClass {
}
$cases = [ MyDynamicClass::class, stdClass::class, NonDynamicClass::class ];
foreach ( $cases as $c ) {
echo "$c:" . PHP_EOL;
$obj = new $c();
$obj->prop = 'foo';
$prop = new ReflectionProperty($obj, 'prop');
var_dump( $prop->getHooks() );
var_dump( $prop->getHook( PropertyHookType::Get ) );
var_dump( $prop->getHook( PropertyHookType::Set ) );
echo PHP_EOL;
}
?>
--EXPECTF--
MyDynamicClass:
array(0) {
}
NULL
NULL
stdClass:
array(0) {
}
NULL
NULL
NonDynamicClass:
Deprecated: Creation of dynamic property NonDynamicClass::$prop is deprecated in %sgh15718.php on line %d
array(0) {
}
NULL
NULL