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.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix handling of invalid iterator in zend_weakmap_iterator_get_current_key()
This commit is contained in:
Arnaud Le Blanc
2024-10-15 12:23:32 +02:00
parent f68dcc5a1c 900afb6ff0
commit 8aa32601dc
3 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -14,6 +14,7 @@ PHP NEWS
(nielsdos)
. Fixed bug GH-16168 (php 8.1 and earlier crash immediately when compiled
with Xcode 16 clang on macOS 15). (nielsdos)
. Fixed bug GH-16371 (Assertion failure in Zend/zend_weakrefs.c:646). (Arnaud)
- Curl:
. Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if

47
Zend/tests/gh16371.phpt Normal file
View File

@@ -0,0 +1,47 @@
--TEST--
GH-16371: Assertion failure in zend_weakmap_iterator_get_current_key() for invalid iterator
--FILE--
<?php
$map = new WeakMap();
$it = $map->getIterator();
print "# Empty WeakMap\n";
var_dump($it->key());
var_dump($it->current());
var_dump($it->valid());
$map = new WeakMap();
$obj = new stdClass;
$map[$obj] = 0;
print "# Valid iterator\n";
$it = $map->getIterator();
var_dump($it->key());
var_dump($it->current());
var_dump($it->valid());
print "# End of iterator\n";
$it->next();
var_dump($it->key());
var_dump($it->current());
var_dump($it->valid());
?>
--EXPECTF--
# Empty WeakMap
NULL
NULL
bool(false)
# Valid iterator
object(stdClass)#%d (0) {
}
int(0)
bool(true)
# End of iterator
NULL
NULL
bool(false)

4
Zend/zend_weakrefs.c
View File

@@ -642,6 +642,10 @@ static void zend_weakmap_iterator_get_current_key(zend_object_iterator *obj_iter
zend_string *string_key;
zend_ulong num_key;
int key_type = zend_hash_get_current_key_ex(&wm->ht, &string_key, &num_key, pos);
if (key_type == HASH_KEY_NON_EXISTENT) {
ZVAL_NULL(key);
return;
}
if (key_type != HASH_KEY_IS_LONG) {
ZEND_ASSERT(0 && "Must have integer key");
}