mirror of
https://github.com/php/php-src.git
synced 2025-08-20 01:14:28 +02:00
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
This commit is contained in:
commit
f87e513557
3 changed files with 21 additions and 1 deletions
2
NEWS
2
NEWS
|
@ -34,6 +34,8 @@ PHP NEWS
|
||||||
- SPL:
|
- SPL:
|
||||||
. Fixed bug #75155 (AppendIterator::append() is broken when appending another
|
. Fixed bug #75155 (AppendIterator::append() is broken when appending another
|
||||||
AppendIterator). (Nikita)
|
AppendIterator). (Nikita)
|
||||||
|
. Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach loop).
|
||||||
|
(jhdxr)
|
||||||
|
|
||||||
- Standard:
|
- Standard:
|
||||||
. Fixed bug #75152 (signed integer overflow in parse_iv). (Laruence)
|
. Fixed bug #75152 (signed integer overflow in parse_iv). (Laruence)
|
||||||
|
|
|
@ -3374,7 +3374,7 @@ SPL_METHOD(AppendIterator, append)
|
||||||
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O", &it, zend_ce_iterator) == FAILURE) {
|
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O", &it, zend_ce_iterator) == FAILURE) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator) == SUCCESS) {
|
if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator) == SUCCESS && spl_dual_it_valid(intern) != SUCCESS) {
|
||||||
spl_array_iterator_append(&intern->u.append.zarrayit, it);
|
spl_array_iterator_append(&intern->u.append.zarrayit, it);
|
||||||
intern->u.append.iterator->funcs->move_forward(intern->u.append.iterator);
|
intern->u.append.iterator->funcs->move_forward(intern->u.append.iterator);
|
||||||
}else{
|
}else{
|
||||||
|
|
18
ext/spl/tests/bug75173.phpt
Normal file
18
ext/spl/tests/bug75173.phpt
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
--TEST--
|
||||||
|
Bug #75173 incorrect behavior of AppendIterator::append in foreach loop
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
|
||||||
|
$it = new \AppendIterator();
|
||||||
|
$it->append(new ArrayIterator(['foo']));
|
||||||
|
|
||||||
|
foreach ($it as $item) {
|
||||||
|
var_dump($item);
|
||||||
|
|
||||||
|
if ('foo' === $item) {
|
||||||
|
$it->append(new ArrayIterator(['bar']));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--EXPECT--
|
||||||
|
string(3) "foo"
|
||||||
|
string(3) "bar"
|
Loading…
Add table
Add a link
Reference in a new issue