Commit 4aa77a1b05b for php.net

commit 4aa77a1b05bf4639dba9d4d769d65ccf38fcc221
Merge: 6da7eabab46 282be4eceb1
Author: David Carlier <devnexen@gmail.com>
Date:   Wed Sep 23 20:07:36 2026 +0100

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5:
      Fix GH-23811: SplFixedArray leak on re-init and broken setSize()

diff --cc ext/spl/spl_fixedarray.c
index a53a2cc73a1,61f6da4cff2..97e12f3e8d8
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@@ -556,9 -577,11 +571,9 @@@ PHP_METHOD(SplFixedArray, __wakeup
  	HashTable *intern_ht = zend_std_get_properties(Z_OBJ_P(ZEND_THIS));
  	zval *data;

 -	if (zend_parse_parameters_none() == FAILURE) {
 -		RETURN_THROWS();
 -	}
 +	ZEND_PARSE_PARAMETERS_NONE();

- 	if (intern->array.size == 0) {
+ 	if (EXPECTED(intern->array.size == 0 && !spl_fixedarray_resize_in_progress(&intern->array))) {
  		int index = 0;
  		int size = zend_hash_num_elements(intern_ht);