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' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-20073: Assertion failure in WeakMap offset operations on reference
This commit is contained in:
Niels Dossche
2025-10-07 20:17:07 +02:00
parent d4e8bf8298 b47c3b633d
commit 544617a3fa
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Zend/tests/weakrefs/gh20073.phpt Normal file
View File

@@ -0,0 +1,15 @@
--TEST--
GH-20073 (Assertion failure in WeakMap offset operations on reference)
--FILE--
<?php
$obj = new stdClass;
$map = new WeakMap;
$integer = 1;
$map[$obj] = 0;
$map[$obj] =& $integer;
$integer++;
var_dump($map[$obj], $map->offsetGet($obj));
?>
--EXPECT--
int(2)
int(2)

2
Zend/zend_weakrefs.c
View File

@@ -731,7 +731,7 @@ ZEND_METHOD(WeakMap, offsetGet)
RETURN_THROWS();
}
ZVAL_COPY(return_value, zv);
RETURN_COPY_DEREF(zv);
}
ZEND_METHOD(WeakMap, offsetSet)