Skip to content

Commit 442d09d

Browse files
committed
Fix prop info fetching from prop slot with added hooks
Fixes GH-18268
1 parent 1e9e397 commit 442d09d

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--TEST--
2+
GH-18268: array_walk() on object with added property hooks
3+
--FILE--
4+
<?php
5+
6+
class A {
7+
public $prop = 42;
8+
}
9+
10+
class B extends A {
11+
public $prop = 42 {
12+
set {}
13+
}
14+
}
15+
16+
$b = new B;
17+
array_walk($b, function (&$item) {
18+
var_dump($item);
19+
});
20+
21+
?>
22+
--EXPECT--
23+
int(42)

Zend/zend_objects_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object) /* {{{ *
203203

204204
ZEND_API ZEND_COLD zend_property_info *zend_get_property_info_for_slot_slow(zend_object *obj, zval *slot)
205205
{
206-
uintptr_t offset = (uintptr_t)slot - (uintptr_t)obj->properties_table;
206+
uintptr_t offset = (uintptr_t)slot - (uintptr_t)obj;
207207
zend_property_info *prop_info;
208208
ZEND_HASH_MAP_FOREACH_PTR(&obj->ce->properties_info, prop_info) {
209209
if (prop_info->offset == offset) {

0 commit comments

Comments
 (0)