clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fix reference returned from CallbackFilterIterator::accept()
This commit is contained in:
Ilija Tovilo 2023-04-20 13:43:20 +02:00
commit b2282bee32
No known key found for this signature in database
GPG Key ID: A4F5D403F118200A
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Zend/tests/oss_fuzz_58181.phpt Normal file
View File

@ -0,0 +1,14 @@
--TEST--
oss-fuzz #58181: Fix unexpected reference returned from CallbackFilterIterator::accept()
--FILE--
<?php
function test(array $data) {
$iterator = new ArrayIterator($data);
$iterator = new \CallbackFilterIterator($iterator, fn&() => true);
$iterator->rewind();
}
test(['a', 'b']);
?>
--EXPECTF--
Notice: Only variable references should be returned by reference in %s on line %d

2
ext/spl/spl_iterators.c
View File

@ -1828,6 +1828,8 @@ PHP_METHOD(CallbackFilterIterator, accept)
if (zend_call_function(fci, fcc) != SUCCESS || Z_ISUNDEF_P(return_value)) {
RETURN_FALSE;
} else if (Z_ISREF_P(return_value)) {
zend_unwrap_reference(return_value);
}
}
/* }}} */