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

Merge branch 'PHP-7.3'

Browse Source 
* PHP-7.3:
  Fixed bug #76800 (foreach inconsistent if array modified during loop)
This commit is contained in:
Dmitry Stogov
2018-09-14 10:33:32 +03:00
parent c571005bd9 17c7b71057
commit 7eb255e9db
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Zend/tests/bug76800.phpt Normal file
View File

@@ -0,0 +1,13 @@
--TEST--
Bug #76800 (foreach inconsistent if array modified during loop)
--FILE--
<?php
$arr = [1 => 1, 3 => 3]; // [1 => 1, 2 => 3] will print both keys
foreach($arr as $key => &$val) { // without & will print both keys
echo "See key {$key}\n";
$arr[0] = 0; // without this line will print both keys
unset($arr[0]);
}
--EXPECT--
See key 1
See key 3

8
Zend/zend_hash.c
View File

@@ -1179,9 +1179,11 @@ ZEND_API int ZEND_FASTCALL zend_hash_rehash(HashTable *ht)
if (UNEXPECTED(ht->nInternalPointer == i)) {
ht->nInternalPointer = j;
}
if (UNEXPECTED(i == iter_pos)) {
zend_hash_iterators_update(ht, i, j);
iter_pos = zend_hash_iterators_lower_pos(ht, iter_pos + 1);
if (UNEXPECTED(i >= iter_pos)) {
do {
zend_hash_iterators_update(ht, iter_pos, j);
iter_pos = zend_hash_iterators_lower_pos(ht, iter_pos + 1);
} while (iter_pos < i);
}
q++;
j++;