diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-06-22 11:57:22 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-06-22 11:57:39 +0100 |
| commit | c56378b0d5ae2f9488a60d16cec58d50b11cc4ac (patch) | |
| tree | 1fc1280fff23ea2be697a36d46e04f39055333e6 | |
| parent | ed1f64e0837dbc70496c4b17be24703373871c68 (diff) | |
| parent | 81c2a4b9ba0816a0bda4f004aeca634ad8b58970 (diff) | |
| download | php-git-c56378b0d5ae2f9488a60d16cec58d50b11cc4ac.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix bug #73471 PHP freezes with AppendIterator
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/spl/spl_iterators.c | 7 | ||||
| -rw-r--r-- | ext/spl/tests/bug73471.phpt | 15 |
3 files changed, 24 insertions, 1 deletions
@@ -6,6 +6,9 @@ PHP NEWS . Fixed bug #74780 (parse_url() borken when query string contains colon). (jhdxr) +- SPL: + . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr) + 06 Jul 2017, PHP 7.1.7 - Core: diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 6690c4a8f7..72e0f2f606 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -3374,7 +3374,12 @@ SPL_METHOD(AppendIterator, append) if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O", &it, zend_ce_iterator) == FAILURE) { return; } - spl_array_iterator_append(&intern->u.append.zarrayit, it); + if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator) == SUCCESS) { + spl_array_iterator_append(&intern->u.append.zarrayit, it); + intern->u.append.iterator->funcs->move_forward(intern->u.append.iterator); + }else{ + spl_array_iterator_append(&intern->u.append.zarrayit, it); + } if (!intern->inner.iterator || spl_dual_it_valid(intern) != SUCCESS) { if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator) != SUCCESS) { diff --git a/ext/spl/tests/bug73471.phpt b/ext/spl/tests/bug73471.phpt new file mode 100644 index 0000000000..6fdbf187be --- /dev/null +++ b/ext/spl/tests/bug73471.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #73471 PHP freezes with AppendIterator +--FILE-- +<?php + +$iterator = new \AppendIterator(); +$events = new \ArrayIterator([1,2,3,4,5]); +$events2 = new \ArrayIterator(['a', 'b', 'c']); +$iterator->append($events); +foreach($events as $event){} +$iterator->append($events2); +?> +===DONE=== +--EXPECT-- +===DONE=== |