php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix GH-17447: Assertion failure when array popping a self addressing variable
This commit is contained in:
Niels Dossche
2025-01-16 20:29:08 +01:00
parent a4fa1e728a ae3ab37816
commit d0d8e6867a
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/standard/array.c
View File

@@ -3571,7 +3571,8 @@ PHP_FUNCTION(array_pop)
break;
}
}
RETVAL_COPY_DEREF(val);
RETVAL_COPY_VALUE(val);
ZVAL_UNDEF(val);
if (idx == (Z_ARRVAL_P(stack)->nNextFreeElement - 1)) {
Z_ARRVAL_P(stack)->nNextFreeElement = Z_ARRVAL_P(stack)->nNextFreeElement - 1;
@@ -3595,7 +3596,8 @@ PHP_FUNCTION(array_pop)
break;
}
}
RETVAL_COPY_DEREF(val);
RETVAL_COPY_VALUE(val);
ZVAL_UNDEF(val);
if (!p->key && (zend_long)p->h == (Z_ARRVAL_P(stack)->nNextFreeElement - 1)) {
Z_ARRVAL_P(stack)->nNextFreeElement = Z_ARRVAL_P(stack)->nNextFreeElement - 1;
@@ -3605,6 +3607,10 @@ PHP_FUNCTION(array_pop)
zend_hash_del_bucket(Z_ARRVAL_P(stack), p);
}
zend_hash_internal_pointer_reset(Z_ARRVAL_P(stack));
if (Z_ISREF_P(return_value)) {
zend_unwrap_reference(return_value);
}
}
/* }}} */

12
ext/standard/tests/array/gh17447.phpt Normal file
View File

@@ -0,0 +1,12 @@
--TEST--
GH-17447 (Assertion failure when array poping a self addressing variable)
--FILE--
<?php
$input[] = &$input;
var_dump(array_pop($input), $input);
?>
--EXPECT--
array(0) {
}
array(0) {
}