Skip to content
New issue

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

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

Already on GitHub? # to your account

Fix get_object_vars() for non-hooked props in hooked prop iter #16805

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions Zend/tests/gh16725.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
GH-16725: Incorrect access check for non-hooked props in hooked object iterator
--FILE--
<?php

class C implements JsonSerializable
{
private string $prop1 { get => 'bar'; }

public function __construct(
private string $prop2,
) {}

public function jsonSerialize(): mixed {
return get_object_vars($this);
}
}

$obj = new C('foo');
var_dump(get_object_vars($obj));
echo json_encode($obj);

?>
--EXPECT--
array(0) {
}
{"prop1":"bar","prop2":"foo"}
3 changes: 2 additions & 1 deletion Zend/zend_property_hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ static zend_array *zho_build_properties_ex(zend_object *zobj, bool check_access,
if (UNEXPECTED(Z_TYPE_P(OBJ_PROP(zobj, prop_info->offset)) == IS_UNDEF)) {
HT_FLAGS(properties) |= HASH_FLAG_HAS_EMPTY_IND;
}
zend_hash_update_ind(properties, property_name, OBJ_PROP(zobj, prop_info->offset));
zval *tmp = zend_hash_lookup(properties, property_name);
ZVAL_INDIRECT(tmp, OBJ_PROP(zobj, prop_info->offset));
}
skip_property:
if (property_name != prop_info->name) {
Expand Down