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

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Fix leaked parent property default value
This commit is contained in:
Ilija Tovilo
2026-01-13 13:09:29 +01:00
parent 0a90dd6f92 c35e391b2d
commit dc03108459
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Zend/tests/oss-fuzz-474613951.phpt Normal file
View File

@@ -0,0 +1,17 @@
--TEST--
OSS-Fuzz #474613951: Leaked parent property default value
--FILE--
<?php
class A {
public $prop = C { get => $this->prop; }
}
class B extends A {
public $prop { get => 42; }
}
?>
===DONE===
--EXPECT--
===DONE===

5
Zend/zend_inheritance.c
View File

@@ -1515,10 +1515,9 @@ static void do_inherit_property(zend_property_info *parent_info, zend_string *ke
}
int parent_num = OBJ_PROP_TO_NUM(parent_info->offset);
/* Don't keep default properties in GC (they may be freed by opcache) */
zval_ptr_dtor_nogc(&(ce->default_properties_table[parent_num]));
if (child_info->offset != ZEND_VIRTUAL_PROPERTY_OFFSET) {
/* Don't keep default properties in GC (they may be freed by opcache) */
zval_ptr_dtor_nogc(&(ce->default_properties_table[parent_num]));
if (use_child_prop) {
ZVAL_UNDEF(&ce->default_properties_table[parent_num]);
} else {