archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Tweak behaviour of dynamic properties wrt error handlers

Browse source 
With the fix in https://github.com/php/php-src/pull/12114, the behaviour
would change for non-dynamic properties. Align the behaviour for dynamic
properties to be the same.

Closes GH-12117.
This commit is contained in:
Niels Dossche 2023-09-03 15:59:23 +02:00
parent 6b74f1f745
commit eee1617f38
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Zend/tests/oss_fuzz_61712b.phpt Normal file
View file

@ -0,0 +1,20 @@
--TEST--
OSS-Fuzz #61712 (assertion failure with error handler during binary op)
--FILE--
<?php
#[AllowDynamicProperties]
class C {
function error($_, $msg) {
echo $msg, "\n";
$this->a = 12345;
}
}
$c = new C;
set_error_handler([$c, 'error']);
$c->a %= 10;
var_dump($c->a);
?>
--EXPECT--
Undefined property: C::$a
int(5)

2
Zend/zend_object_handlers.c
View file

@ -1163,7 +1163,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam
if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name));
}
retval = zend_hash_update(zobj->properties, name, &EG(uninitialized_zval));
retval = zend_hash_add(zobj->properties, name, &EG(uninitialized_zval));
}
} else if (zobj->ce->__get == NULL) {
retval = &EG(error_zval);