Skip to content

Do not allow sideeffects when readonly property modification fails #10757

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

Merged
merged 3 commits into from
Mar 3, 2023
Merged

Do not allow sideeffects when readonly property modification fails #10757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40ef5b8
Do not allow sideeffects when readonly property modification fails
kocsismate Mar 3, 2023
ebe358c
Code review fixes
kocsismate Mar 3, 2023
1ca5562
New line fix
kocsismate Mar 3, 2023
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
33 changes: 33 additions & 0 deletions Zend/tests/readonly_props/readonly_assign_no_sideeffect.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
Test that there can be no side-effect when a readonly property modification fails
--FILE--
<?php

class Foo {
public function __construct(
public readonly string $bar
) {}

public function write() {
$this->bar = new S();
}
}

class S {
public function __toString() {
var_dump("Side-effect in __toString()");
return "";
}
}

$foo = new Foo("");

try {
$foo->write();
} catch (Error $e) {
echo $e->getMessage() . "\n";
}

?>
--EXPECT--
Cannot modify readonly property Foo::$bar
15 changes: 6 additions & 9 deletions Zend/zend_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,11 @@ static zend_never_inline zval* zend_assign_to_typed_prop(zend_property_info *inf
{
zval tmp;

if (UNEXPECTED((info->flags & ZEND_ACC_READONLY) && !(Z_PROP_FLAG_P(property_val) & IS_PROP_REINITABLE))) {
zend_readonly_property_modification_error(info);
return &EG(uninitialized_zval);
}

ZVAL_DEREF(value);
ZVAL_COPY(&tmp, value);

Expand All @@ -1017,15 +1022,7 @@ static zend_never_inline zval* zend_assign_to_typed_prop(zend_property_info *inf
return &EG(uninitialized_zval);
}

if (UNEXPECTED(info->flags & ZEND_ACC_READONLY)) {
if (Z_PROP_FLAG_P(property_val) & IS_PROP_REINITABLE) {
Z_PROP_FLAG_P(property_val) &= ~IS_PROP_REINITABLE;
} else {
zval_ptr_dtor(&tmp);
zend_readonly_property_modification_error(info);
return &EG(uninitialized_zval);
}
}
Z_PROP_FLAG_P(property_val) &= ~IS_PROP_REINITABLE;

return zend_assign_to_variable(property_val, &tmp, IS_TMP_VAR, EX_USES_STRICT_TYPES());
}
Expand Down
18 changes: 8 additions & 10 deletions Zend/zend_object_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,13 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
Z_TRY_ADDREF_P(value);

if (UNEXPECTED(prop_info)) {
if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY) && !(Z_PROP_FLAG_P(variable_ptr) & IS_PROP_REINITABLE))) {
Z_TRY_DELREF_P(value);
zend_readonly_property_modification_error(prop_info);
variable_ptr = &EG(error_zval);
goto exit;
}

ZVAL_COPY_VALUE(&tmp, value);
// Increase refcount to prevent object from being released in __toString()
GC_ADDREF(zobj);
Expand All @@ -828,16 +835,7 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
variable_ptr = &EG(error_zval);
goto exit;
}
if (UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {
if (Z_PROP_FLAG_P(variable_ptr) & IS_PROP_REINITABLE) {
Z_PROP_FLAG_P(variable_ptr) &= ~IS_PROP_REINITABLE;
} else {
zval_ptr_dtor(&tmp);
zend_readonly_property_modification_error(prop_info);
variable_ptr = &EG(error_zval);
goto exit;
}
}
Z_PROP_FLAG_P(variable_ptr) &= ~IS_PROP_REINITABLE;
value = &tmp;
}

Expand Down