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

Revert "Fixed #74977 - Appending AppendIterator leads to segfault"

Browse Source 
This reverts commit dbc2ffba82.
This commit is contained in:
Nikita Popov 2017-09-04 21:20:49 +02:00
parent 296d0826da
commit b689857d53
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/spl/spl_iterators.c
View File

@ -3367,7 +3367,7 @@ SPL_METHOD(AppendIterator, __construct)
Append an iterator */
SPL_METHOD(AppendIterator, append)
{
spl_dual_it_object *intern, *appender;
spl_dual_it_object *intern;
zval *it;
SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis());
@ -3379,11 +3379,6 @@ SPL_METHOD(AppendIterator, append)
spl_array_iterator_append(&intern->u.append.zarrayit, it);
intern->u.append.iterator->funcs->move_forward(intern->u.append.iterator);
}else{
appender = Z_SPLDUAL_IT_P(it);
if (appender->dit_type == DIT_AppendIterator) {
spl_array_iterator_append(&intern->u.append.zarrayit, &appender->u.append.zarrayit);
return;
}
spl_array_iterator_append(&intern->u.append.zarrayit, it);
}

13
ext/spl/tests/bug74977.phpt
View File

@ -1,13 +0,0 @@
--TEST--
Bug #74977: Recursion leads to crash
--FILE--
<?php
$iterator = new AppendIterator(array("A","A","A"));
$iterator->append($iterator);
var_dump($iterator);
?>
--EXPECTF--
object(AppendIterator)#1 (0) {
}