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

Fix stale nInternalPosition on rehashing

Browse source 
Since GH-13188 we're no longer immediately updating iterator positions when
deleting array elements. zend_hash_rehash() needs to adapt accordingly by
adjusting nInternalPosition for IS_UNDEF elements. This is already the case for
array iterators.

Fixes GH-19280
Closes GH-19323
This commit is contained in:
Ilija Tovilo 2025-07-30 23:57:21 +02:00
parent 771bfaf34d
commit 5d40592fe2
No known key found for this signature in database
GPG key ID: 115CEA7A713E12E9
3 changed files with 84 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -21,6 +21,7 @@ PHP NEWS
delegated Generator). (Arnaud) delegated Generator). (Arnaud)
. Fixed bug GH-19326 (Calling Generator::throw() on a running generator with . Fixed bug GH-19326 (Calling Generator::throw() on a running generator with
a non-Generator delegate crashes). (Arnaud) a non-Generator delegate crashes). (Arnaud)
. Fixed bug GH-19280 (Stale array iterator position on rehashing). (ilutov)
- FTP: - FTP:
. Fix theoretical issues with hrtime() not being available. (nielsdos) . Fix theoretical issues with hrtime() not being available. (nielsdos)

81
Zend/tests/gh19280.phpt Normal file
View file

@ -0,0 +1,81 @@
--TEST--
GH-19280: Stale nInternalPosition on rehashing
--FILE--
<?php
function rehash_packed() {
$a = range(0, 63);
for ($i = 0; $i <= 47; $i++) {
next($a);
}
for ($i = 16; $i < 62; $i++) {
unset($a[$i]);
}
var_dump(key($a));
$a[64] = 64;
var_dump(key($a));
}
function rehash_packed_iterated() {
$a = range(0, 63);
for ($i = 0; $i <= 47; $i++) {
next($a);
}
for ($i = 16; $i < 62; $i++) {
unset($a[$i]);
}
var_dump(key($a));
foreach ($a as &$_) {
$a[64] = 64;
break;
}
var_dump(key($a));
}
function rehash_string() {
$a = [];
for ($i = 0; $i < 64; $i++) {
$a[md5($i)] = $i;
}
for ($i = 0; $i <= 47; $i++) {
next($a);
}
for ($i = 16; $i < 62; $i++) {
unset($a[md5($i)]);
}
var_dump(key($a));
$a[md5(64)] = 64;
var_dump(key($a));
}
function rehash_int() {
$a = [];
for ($i = 63; $i >= 0; $i--) {
$a[$i] = $i;
}
for ($i = 0; $i <= 47; $i++) {
next($a);
}
for ($i = 48; $i >= 2; $i--) {
unset($a[$i]);
}
var_dump(key($a));
$a[64] = 64;
var_dump(key($a));
}
rehash_packed();
rehash_packed_iterated();
rehash_string();
rehash_int();
?>
--EXPECT--
int(62)
int(62)
int(62)
int(62)
string(32) "44f683a84163b3523afe57c2e008bc8c"
string(32) "44f683a84163b3523afe57c2e008bc8c"
int(1)
int(1)

4
Zend/zend_hash.c
View file

@ -1379,7 +1379,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_rehash(HashTable *ht)
q->key = p->key; q->key = p->key;
Z_NEXT(q->val) = HT_HASH(ht, nIndex); Z_NEXT(q->val) = HT_HASH(ht, nIndex);
HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(j); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(j);
if (UNEXPECTED(ht->nInternalPointer == i)) { if (UNEXPECTED(ht->nInternalPointer > j && ht->nInternalPointer <= i)) {
ht->nInternalPointer = j; ht->nInternalPointer = j;
} }
q++; q++;
@ -1398,7 +1398,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_rehash(HashTable *ht)
q->key = p->key; q->key = p->key;
Z_NEXT(q->val) = HT_HASH(ht, nIndex); Z_NEXT(q->val) = HT_HASH(ht, nIndex);
HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(j); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(j);
if (UNEXPECTED(ht->nInternalPointer == i)) { if (UNEXPECTED(ht->nInternalPointer > j && ht->nInternalPointer <= i)) {
ht->nInternalPointer = j; ht->nInternalPointer = j;
} }
if (UNEXPECTED(i >= iter_pos)) { if (UNEXPECTED(i >= iter_pos)) {