Commit 9974bc88647 for php
commit 9974bc88647c810790dbab785d7d641452ffa91d
Author: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue Nov 17 17:38:54 2026 +0100
Fix object_properties_load() with integer keys (#25495)
A dynamic property with an integer key is added to the property table
under that integer, when unserialize() gives a string key to the
properties of other objects. The property can't be read then, and clone
hits an assertion in debug builds when the table is packed:
$s = new SplObjectStorage();
$s->__unserialize([[], [7 => 'y']]);
var_dump($s->{7}); // Undefined property
clone $s;
diff --git a/NEWS b/NEWS
index 5fde6a46c6b..ab9ee523cc1 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ PHP NEWS
. Fixed use-after-free when a Fiber callable resolves to $this of the method
creating the Fiber ([A::class, 'm'] or "A::m") and that object dies before
the Fiber runs. (Edmond Dantes)
+ . Fixed object_properties_load() adding integer keys to property tables, which
+ made the properties unreadable and clone hit an assertion.
+ (Nicolas Grekas)
- CLI:
. Fixed built-in server rejecting long request paths, or paths received in
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index d8ea2c5ed55..b9edd8832c3 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1798,7 +1798,10 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties)
ZSTR_VAL(object->ce->name), h);
}
- prop = zend_hash_index_update(zend_std_get_properties_ex(object), h, prop);
+ /* Property tables only have string keys */
+ zend_string *name = zend_long_to_str(h);
+ prop = zend_hash_update(zend_std_get_properties_ex(object), name, prop);
+ zend_string_release_ex(name, false);
zval_add_ref(prop);
}
} ZEND_HASH_FOREACH_END();
diff --git a/ext/gmp/tests/gmp_dynamic_property.phpt b/ext/gmp/tests/gmp_dynamic_property.phpt
index ff3d4ac94e0..dd442043a27 100644
--- a/ext/gmp/tests/gmp_dynamic_property.phpt
+++ b/ext/gmp/tests/gmp_dynamic_property.phpt
@@ -17,7 +17,7 @@
Deprecated: Creation of dynamic property GMP::$1 is deprecated in %s on line %d
object(GMP)#%d (%d) {
- [1]=>
+ ["1"]=>
int(123)
["num"]=>
string(1) "0"
diff --git a/ext/spl/tests/SplObjectStorage/SplObjectStorage_unserialize_int_property_keys.phpt b/ext/spl/tests/SplObjectStorage/SplObjectStorage_unserialize_int_property_keys.phpt
new file mode 100644
index 00000000000..deb59b15a45
--- /dev/null
+++ b/ext/spl/tests/SplObjectStorage/SplObjectStorage_unserialize_int_property_keys.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Integer keys in the properties that internal classes load when unserialized
+--FILE--
+<?php
+
+#[AllowDynamicProperties]
+class Storage extends SplObjectStorage {}
+
+$storage = unserialize('O:7:"Storage":2:{i:0;a:0:{}i:1;a:1:{i:7;s:1:"y";}}');
+var_dump($storage->{7});
+var_dump(clone $storage);
+
+?>
+--EXPECT--
+string(1) "y"
+object(Storage)#2 (2) {
+ ["7"]=>
+ string(1) "y"
+ ["storage":"SplObjectStorage":private]=>
+ array(0) {
+ }
+}