Skip to content

Fix duplicate dynamic properties in hooked object iterator properties table #17085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix duplicate dynamic properties in hooked object iterator properties table #17085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Zend/tests/property_hooks/oss-fuzz-1638179.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
OSS-Fuzz #69765: Duplicate dynamic properties in hooked object iterator properties table
--FILE--
<?php

#[AllowDynamicProperties]
class C {
public $a {
get => 42;
}
}

$obj = new C();
$b = &$obj->b;
unset($b);
echo json_encode($obj);

?>
--EXPECT--
{"a":42,"b":null}
7 changes: 5 additions & 2 deletions Zend/zend_property_hooks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ static uint32_t zho_num_backed_props(zend_object *zobj)
static zend_array *zho_build_properties_ex(zend_object *zobj, bool check_access, bool force_ptr, bool include_dynamic_props)
{
zend_class_entry *ce = zobj->ce;
zend_array *properties = zend_new_array(ce->default_properties_count);
zend_array *properties = zend_new_array(include_dynamic_props && zobj->properties
? zend_hash_num_elements(zobj->properties)
: ce->default_properties_count);
zend_hash_real_init_mixed(properties);

/* Build list of parents */
Expand Down Expand Up @@ -105,7 +107,8 @@ static zend_array *zho_build_properties_ex(zend_object *zobj, bool check_access,
zend_string *prop_name;
zval *prop_value;
ZEND_HASH_FOREACH_STR_KEY_VAL_FROM(zobj->properties, prop_name, prop_value, zho_num_backed_props(zobj)) {
Z_TRY_ADDREF_P(_zend_hash_append(properties, prop_name, prop_value));
zval *tmp = _zend_hash_append(properties, prop_name, prop_value);
Z_TRY_ADDREF_P(tmp);
} ZEND_HASH_FOREACH_END();
}

Expand Down
Loading