Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
8 changes: 8 additions & 0 deletions Zend/zend_API.c
Original file line number Diff line number Diff line change
Expand Up @@ -1701,6 +1701,14 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties)
property_info &&
(property_info->flags & ZEND_ACC_STATIC) == 0) {
zval *slot = OBJ_PROP(object, property_info->offset);
if (UNEXPECTED((property_info->flags & ZEND_ACC_READONLY) && !Z_ISUNDEF_P(slot))) {
if (Z_PROP_FLAG_P(slot) & IS_PROP_REINITABLE) {
Z_PROP_FLAG_P(slot) &= ~IS_PROP_REINITABLE;
} else {
zend_readonly_property_modification_error(property_info);
return;
}
}
zval_ptr_dtor(slot);
ZVAL_COPY_VALUE(slot, prop);
zval_add_ref(slot);
Expand Down
21 changes: 21 additions & 0 deletions ext/random/tests/03_randomizer/gh_19765_unserialize.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
GH-19765: object_properties_load() bypasses readonly property checks
--FILE--
<?php

use Random\Engine\Mt19937;
use Random\Engine\PcgOneseq128XslRr64;
use Random\Randomizer;

try {
$r = new Randomizer(new Mt19937());
$r->__unserialize([['engine' => new PcgOneseq128XslRr64()]]);
} catch (Exception $error) {
echo $error->getMessage() . "\n";
}
var_dump($r->engine::class);

?>
--EXPECT--
Invalid serialization data for Random\Randomizer object
string(21) "Random\Engine\Mt19937"
2 changes: 1 addition & 1 deletion ext/random/tests/03_randomizer/gh_9186_unserialize.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Fix GH-9186 @strict-properties can be bypassed using unserialization
GH-9186: @strict-properties can be bypassed using unserialization
--FILE--
<?php

Expand Down
Loading