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

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-16957: Assertion failure in array_shift with self-referencing array
This commit is contained in:
Niels Dossche
2024-11-29 19:21:49 +01:00
parent 8ea042d954 f1fc4e8ff7
commit ab7c3b1e7b
3 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -43,6 +43,8 @@ PHP NEWS
- Standard:
. Fixed bug GH-16905 (Internal iterator functions can't handle UNDEF
properties). (nielsdos)
. Fixed bug GH-16957 (Assertion failure in array_shift with
self-referencing array). (nielsdos)
- Streams:
. Fixed network connect poll interuption handling. (Jakub Zelenka)

10
ext/standard/array.c
View File

@@ -3632,7 +3632,8 @@ PHP_FUNCTION(array_shift)
}
idx++;
}
RETVAL_COPY_DEREF(val);
RETVAL_COPY_VALUE(val);
ZVAL_UNDEF(val);
/* Delete the first value */
zend_hash_packed_del_val(Z_ARRVAL_P(stack), val);
@@ -3686,7 +3687,8 @@ PHP_FUNCTION(array_shift)
}
idx++;
}
RETVAL_COPY_DEREF(val);
RETVAL_COPY_VALUE(val);
ZVAL_UNDEF(val);
/* Delete the first value */
zend_hash_del_bucket(Z_ARRVAL_P(stack), p);
@@ -3710,6 +3712,10 @@ PHP_FUNCTION(array_shift)
}
zend_hash_internal_pointer_reset(Z_ARRVAL_P(stack));
if (Z_ISREF_P(return_value)) {
zend_unwrap_reference(return_value);
}
}
/* }}} */

41
ext/standard/tests/array/gh16957.phpt Normal file
View File

@@ -0,0 +1,41 @@
--TEST--
GH-16957 (Assertion failure in array_shift with self-referencing array)
--FILE--
<?php
$new_array = array(&$new_array, 1, 'two');
var_dump($shifted = array_shift($new_array));
var_dump($new_array);
var_dump($new_array === $shifted);
$new_array2 = array(&$new_array2, 2 => 1, 300 => 'two');
var_dump($shifted = array_shift($new_array2));
var_dump($new_array2);
var_dump($new_array2 === $shifted);
?>
--EXPECT--
array(2) {
[0]=>
int(1)
[1]=>
string(3) "two"
}
array(2) {
[0]=>
int(1)
[1]=>
string(3) "two"
}
bool(true)
array(2) {
[0]=>
int(1)
[1]=>
string(3) "two"
}
array(2) {
[0]=>
int(1)
[1]=>
string(3) "two"
}
bool(true)