mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-22 11:44:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't treat failed assignment as initialization

Browse Source 
Only reset the uninitialized property flag once the type check
has succeeded. Previously the property was treated as unset rather
than uninitialized after a failed assignment.

Noticed this edge-case while working on accessors...
This commit is contained in:
Nikita Popov 2021-05-04 14:44:54 +02:00
parent 5ce0fa2129
commit 398cfb982e
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Zend/tests/type_declarations/typed_properties_failed_assign_is_not_init.phpt Normal file
View File

@ -0,0 +1,36 @@
--TEST--
A failed assignment should not be considered an initialization
--FILE--
<?php
class Test {
public int $prop;
public function __get($name) {
echo "__get() called\n";
return 0;
}
}
$test = new Test;
try {
$test->prop;
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
try {
$test->prop = "foo";
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
try {
$test->prop;
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Typed property Test::$prop must not be accessed before initialization
Cannot assign string to property Test::$prop of type int
Typed property Test::$prop must not be accessed before initialization

2
Zend/zend_object_handlers.c
View File

@ -728,7 +728,6 @@ found:
}
if (Z_PROP_FLAG_P(variable_ptr) == IS_PROP_UNINIT) {
/* Writes to uninitializde typed properties bypass __set(). */
Z_PROP_FLAG_P(variable_ptr) = 0;
goto write_std_property;
}
} else if (EXPECTED(IS_DYNAMIC_PROPERTY_OFFSET(property_offset))) {
@ -783,6 +782,7 @@ write_std_property:
goto exit;
}
value = &tmp;
Z_PROP_FLAG_P(variable_ptr) = 0;
goto found; /* might have been updated via e.g. __toString() */
}