archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  Fix reference returned from CallbackFilterIterator::accept()
This commit is contained in:
Ilija Tovilo 2023-04-20 13:43:29 +02:00
commit 04fd04acab
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
2 changed files with 16 additions and 0 deletions
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

@ -1822,6 +1822,8 @@ PHP_METHOD(CallbackFilterIterator, accept)
zend_call_known_fcc(fcc, return_value, 3, params, NULL); zend_call_known_fcc(fcc, return_value, 3, params, NULL);
if (Z_ISUNDEF_P(return_value)) { if (Z_ISUNDEF_P(return_value)) {
RETURN_FALSE; RETURN_FALSE;
} else if (Z_ISREF_P(return_value)) {
zend_unwrap_reference(return_value);
} }
} }
/* }}} */ /* }}} */