mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not null out obj->properties when resetting object

Browse Source 
Engine expects the properties ht to be separated, assigned a new ht, or resized,
but never to be nulled.
This commit is contained in:
Arnaud Le Blanc 2024-10-03 14:58:57 +02:00
parent 4d7fcea5da
commit 52fec6958c
No known key found for this signature in database
GPG Key ID: 0098C05DD15ABC13
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Zend/zend_lazy_objects.c
View File

@ -199,6 +199,15 @@ ZEND_API bool zend_class_can_be_lazy(zend_class_entry *ce)
return true; return true;
} }
static int zlo_hash_remove_dyn_props_func(zval *pDest)
{
if (Z_TYPE_P(pDest) == IS_INDIRECT) {
return ZEND_HASH_APPLY_STOP;
}
return ZEND_HASH_APPLY_REMOVE;
}
/* Make object 'obj' lazy. If 'obj' is NULL, create a lazy instance of /* Make object 'obj' lazy. If 'obj' is NULL, create a lazy instance of
* class 'reflection_ce' */ * class 'reflection_ce' */
ZEND_API zend_object *zend_object_make_lazy(zend_object *obj, ZEND_API zend_object *zend_object_make_lazy(zend_object *obj,
@ -278,9 +287,17 @@ ZEND_API zend_object *zend_object_make_lazy(zend_object *obj,
GC_DEL_FLAGS(obj, IS_OBJ_DESTRUCTOR_CALLED); GC_DEL_FLAGS(obj, IS_OBJ_DESTRUCTOR_CALLED);
/* unset() dynamic properties */ /* unset() dynamic properties. Do not NULL out obj->properties, as this
zend_object_dtor_dynamic_properties(obj); * would be unexpected. */
obj->properties = NULL; if (obj->properties) {
if (UNEXPECTED(GC_REFCOUNT(obj->properties) > 1)) {
if (EXPECTED(!(GC_FLAGS(obj->properties) & IS_ARRAY_IMMUTABLE))) {
GC_DELREF(obj->properties);
}
obj->properties = zend_array_dup(obj->properties);
}
zend_hash_reverse_apply(obj->properties, zlo_hash_remove_dyn_props_func);
}
/* unset() declared properties */ /* unset() declared properties */
for (int i = 0; i < reflection_ce->default_properties_count; i++) { for (int i = 0; i < reflection_ce->default_properties_count; i++) {