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 properties_info_table for abstract properties

Browse Source 
Fixes GH-19053
Closes GH-19140

Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
This commit is contained in:
Ilija Tovilo
2025-07-15 20:36:38 +02:00
parent f8196a5db5
commit c8cc23336d
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -5,6 +5,8 @@ PHP NEWS
- Core:
. Fixed GH-19169 build issue with C++17 and ZEND_STATIC_ASSERT macro.
(psumbera)
. Fixed bug GH-19053 (Duplicate property slot with hooks and interface
property). (ilutov)
- Hash:
. Fix crash on clone failure. (nielsdos)

26
Zend/tests/gh19053.phpt Normal file
View File

@@ -0,0 +1,26 @@
--TEST--
GH-19053: Incorrect properties_info_table for abstract properties
--FILE--
<?php
abstract class GP {
public abstract mixed $foo { get; }
}
class P extends GP {
public mixed $foo = 1;
}
class C extends P {
public mixed $foo { get => 2; }
}
$c = new C;
var_dump($c);
?>
--EXPECTF--
object(C)#%d (0) {
["foo"]=>
uninitialized(mixed)
}

19
Zend/zend_inheritance.c
View File

@@ -1687,10 +1687,25 @@ void zend_build_properties_info_table(zend_class_entry *ce)
}
}
ZEND_HASH_MAP_FOREACH_PTR(&ce->properties_info, prop) {
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&ce->properties_info, zend_string *key, prop) {
if (prop->ce == ce && (prop->flags & ZEND_ACC_STATIC) == 0
&& !(prop->flags & ZEND_ACC_VIRTUAL)) {
uint32_t prop_table_offset = OBJ_PROP_TO_NUM(!(prop->prototype->flags & ZEND_ACC_VIRTUAL) ? prop->prototype->offset : prop->offset);
const zend_property_info *root_prop = prop->prototype;
if (UNEXPECTED(root_prop->flags & ZEND_ACC_VIRTUAL)) {
/* Prototype is virtual, we need to manually hunt down the first backed property. */
root_prop = prop;
zend_class_entry *parent_ce;
while ((parent_ce = root_prop->ce->parent)) {
zend_property_info *parent_prop = zend_hash_find_ptr(&parent_ce->properties_info, key);
if (!parent_prop
|| parent_prop->prototype != prop->prototype
|| (parent_prop->flags & ZEND_ACC_VIRTUAL)) {
break;
}
root_prop = parent_prop;
}
}
uint32_t prop_table_offset = OBJ_PROP_TO_NUM(root_prop->offset);
table[prop_table_offset] = prop;
}
} ZEND_HASH_FOREACH_END();