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

Fix GH-15918: Assertion failure in ext/spl/spl_fixedarray.c

Browse source 
SplFixedArray should've never get supported in ArrayObject because it's
overloaded, and so that breaks assumptions. This regressed in c4ecd82f.

Closes GH-15947.
This commit is contained in:
Niels Dossche 2024-09-18 17:32:42 +02:00
parent c76913fde0
commit 9774cedb01
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
4 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -16,6 +16,10 @@ PHP NEWS
. Fixed bug GH-15711 (SoapClient can't convert BackedEnum to scalar value). . Fixed bug GH-15711 (SoapClient can't convert BackedEnum to scalar value).
(nielsdos) (nielsdos)
- SPL:
. Fixed bug GH-15918 (Assertion failure in ext/spl/spl_fixedarray.c).
(nielsdos)
12 Sep 2024, PHP 8.3.12 12 Sep 2024, PHP 8.3.12
- Core: - Core:

2
ext/spl/spl_array.c
View file

@ -1084,7 +1084,7 @@ static void spl_array_set_array(zval *object, spl_array_object *intern, zval *ar
} }
} else { } else {
zend_object_get_properties_t handler = Z_OBJ_HANDLER_P(array, get_properties); zend_object_get_properties_t handler = Z_OBJ_HANDLER_P(array, get_properties);
if (handler != zend_std_get_properties) { if (handler != zend_std_get_properties || Z_OBJ_HANDLER_P(array, get_properties_for)) {
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0, zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0,
"Overloaded object of type %s is not compatible with %s", "Overloaded object of type %s is not compatible with %s",
ZSTR_VAL(Z_OBJCE_P(array)->name), ZSTR_VAL(intern->std.ce->name)); ZSTR_VAL(Z_OBJCE_P(array)->name), ZSTR_VAL(intern->std.ce->name));

28
ext/spl/tests/ArrayObject_overloaded_SplFixedArray.phpt
View file

@ -1,28 +1,16 @@
--TEST-- --TEST--
SplFixedArray properties is compatible with ArrayObject SplFixedArray properties is incompatible with ArrayObject
--FILE-- --FILE--
<?php <?php
$ao = new ArrayObject([1, 2, 3]); $ao = new ArrayObject([1, 2, 3]);
$fixedArray = new SplFixedArray(1); $fixedArray = new SplFixedArray(1);
$fixedArray[0] = new SplDoublyLinkedList(); $fixedArray[0] = new SplDoublyLinkedList();
$ao->exchangeArray($fixedArray); try {
$ao[0] = new stdClass(); // See GH-15918: this *should* fail to not break invariants
var_dump($ao); $ao->exchangeArray($fixedArray);
} catch (InvalidArgumentException $e) {
echo $e->getMessage(), "\n";
}
?> ?>
--EXPECT-- --EXPECT--
object(ArrayObject)#1 (1) { Overloaded object of type SplFixedArray is not compatible with ArrayObject
["storage":"ArrayObject":private]=>
object(SplFixedArray)#2 (2) {
[0]=>
object(SplDoublyLinkedList)#3 (2) {
["flags":"SplDoublyLinkedList":private]=>
int(0)
["dllist":"SplDoublyLinkedList":private]=>
array(0) {
}
}
["0"]=>
object(stdClass)#4 (0) {
}
}
}

13
ext/spl/tests/gh15918.phpt Normal file
View file

@ -0,0 +1,13 @@
--TEST--
GH-15918 (Assertion failure in ext/spl/spl_fixedarray.c)
--FILE--
<?php
$foo = new SplFixedArray(5);
try {
$arrayObject = new ArrayObject($foo);
} catch (InvalidArgumentException $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Overloaded object of type SplFixedArray is not compatible with ArrayObject