Commit 7f5c3cd

committed

Merge branch 'PHP-8.5'

* PHP-8.5: Fix GH-20073: Assertion failure in WeakMap offset operations on reference

2 parents 779ae6f + 544617a commit 7f5c3cdCopy full SHA for 7f5c3cd

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,15 @@`
	`1`	`+--TEST--`
	`2`	`+GH-20073 (Assertion failure in WeakMap offset operations on reference)`
	`3`	`+--FILE--`
	`4`	`+<?php`
	`5`	`+$obj = new stdClass;`
	`6`	`+$map = new WeakMap;`
	`7`	`+$integer = 1;`
	`8`	`+$map[$obj] = 0;`
	`9`	`+$map[$obj] =& $integer;`
	`10`	`+$integer++;`
	`11`	`+var_dump($map[$obj], $map->offsetGet($obj));`
	`12`	`+?>`
	`13`	`+--EXPECT--`
	`14`	`+int(2)`
	`15`	`+int(2)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ ZEND_METHOD(WeakMap, offsetGet)`
`731`	`731`	`RETURN_THROWS();`
`732`	`732`	`}`
`733`	`733`
`734`		`- ZVAL_COPY(return_value, zv);`
	`734`	`+ RETURN_COPY_DEREF(zv);`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`ZEND_METHOD(WeakMap, offsetSet)`

Comments

(0)