diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-09-12 07:06:11 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-09-12 07:06:35 +0100 |
| commit | 7015d22116313fcd49287588bf7da06947926654 (patch) | |
| tree | 9dab7be9b163d173e959f8d90f5a24bca6021a2b | |
| parent | afd59b0c80dafb11ba86be49f050212af9eb3962 (diff) | |
| parent | 3e11b7fc217ee3ce7a3a2833a062d73537cf6bcc (diff) | |
| download | php-git-7015d22116313fcd49287588bf7da06947926654.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/spl/spl_iterators.c | 2 | ||||
| -rw-r--r-- | ext/spl/tests/bug75173.phpt | 18 |
3 files changed, 21 insertions, 1 deletions
@@ -36,6 +36,8 @@ PHP NEWS - SPL: . Fixed bug #75155 (AppendIterator::append() is broken when appending another AppendIterator). (Nikita) + . Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach loop). + (jhdxr) - Standard: . Fixed bug #75152 (signed integer overflow in parse_iv). (Laruence) diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 4373a3b651..e0620125a1 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -3375,7 +3375,7 @@ SPL_METHOD(AppendIterator, append) if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O", &it, zend_ce_iterator) == FAILURE) { 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); intern->u.append.iterator->funcs->move_forward(intern->u.append.iterator); }else{ diff --git a/ext/spl/tests/bug75173.phpt b/ext/spl/tests/bug75173.phpt new file mode 100644 index 0000000000..a2cc9097b1 --- /dev/null +++ b/ext/spl/tests/bug75173.phpt @@ -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" |