Skip to content

Fix GH-24264: Unwind/GracefulExit discarded in spl_iterators.c #24268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lazerg wants to merge 4 commits into from
Closed

Fix GH-24264: Unwind/GracefulExit discarded in spl_iterators.c #24268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92417ca
Fix GH-24264: Unwind/GracefulExit discarded in spl_iterators.c
lazerg Oct 12, 2026
cc75dea
Add getChildren() tests for GH-24264
lazerg Oct 24, 2026
a2e52dd
Drop NEWS entry
lazerg Oct 24, 2026
ed3c6f0
Move CATCH_GET_CHILD check into spl_can_catch_exception()
lazerg Oct 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions ext/spl/spl_iterators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,13 @@ static void spl_recursive_it_get_current_key(zend_object_iterator *iter, zval *k
}
}

static bool spl_can_catch_exception(zend_long flags)
{
return (flags & CIT_CATCH_GET_CHILD)
&& !zend_is_unwind_exit(EG(exception))
&& !zend_is_graceful_exit(EG(exception));
}

static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zval *zthis)
{
zend_object_iterator *iterator;
Expand All @@ -271,7 +278,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
case RS_NEXT:
iterator->funcs->move_forward(iterator);
if (EG(exception)) {
if (!(object->flags & RIT_CATCH_GET_CHILD)) {
if (!spl_can_catch_exception(object->flags)) {
return;
} else {
zend_clear_exception();
Expand Down Expand Up @@ -308,7 +315,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
zend_call_method_with_0_params(obj, ce, cache, "haschildren", &retval);
}
if (EG(exception)) {
if (!(object->flags & RIT_CATCH_GET_CHILD)) {
if (!spl_can_catch_exception(object->flags)) {
object->iterators[object->level].state = RS_NEXT;
return;
} else {
Expand Down Expand Up @@ -344,7 +351,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
}
object->iterators[object->level].state = RS_NEXT;
if (EG(exception)) {
if (!(object->flags & RIT_CATCH_GET_CHILD)) {
if (!spl_can_catch_exception(object->flags)) {
return;
} else {
zend_clear_exception();
Expand Down Expand Up @@ -373,7 +380,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
}

if (EG(exception)) {
if (!(object->flags & RIT_CATCH_GET_CHILD)) {
if (!spl_can_catch_exception(object->flags)) {
return;
} else {
zend_clear_exception();
Expand Down Expand Up @@ -417,7 +424,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
if (object->beginChildren) {
zend_call_method_with_0_params(Z_OBJ_P(zthis), object->ce, &object->beginChildren, "beginchildren", NULL);
if (EG(exception)) {
if (!(object->flags & RIT_CATCH_GET_CHILD)) {
if (!spl_can_catch_exception(object->flags)) {
return;
} else {
zend_clear_exception();
Expand All @@ -431,7 +438,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv
if (object->endChildren) {
zend_call_method_with_0_params(Z_OBJ_P(zthis), object->ce, &object->endChildren, "endchildren", NULL);
if (EG(exception)) {
if (!(object->flags & RIT_CATCH_GET_CHILD)) {
if (!spl_can_catch_exception(object->flags)) {
return;
} else {
zend_clear_exception();
Expand Down Expand Up @@ -2300,7 +2307,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern)
zend_call_method_with_0_params(Z_OBJ(intern->inner.zobject), intern->inner.ce, NULL, "haschildren", &retval);
if (EG(exception)) {
zval_ptr_dtor(&retval);
if (intern->u.caching.flags & CIT_CATCH_GET_CHILD) {
if (spl_can_catch_exception(intern->u.caching.flags)) {
zend_clear_exception();
} else {
return;
Expand All @@ -2316,7 +2323,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern)
zend_call_method_with_0_params(Z_OBJ(intern->inner.zobject), intern->inner.ce, NULL, "getchildren", &args[0]);
if (EG(exception)) {
zval_ptr_dtor(&args[0]);
if (intern->u.caching.flags & CIT_CATCH_GET_CHILD) {
if (spl_can_catch_exception(intern->u.caching.flags)) {
zend_clear_exception();
} else {
return;
Expand All @@ -2333,7 +2340,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern)
);
zval_ptr_dtor(&args[0]);
if (is_initialized == FAILURE) {
if (intern->u.caching.flags & CIT_CATCH_GET_CHILD) {
if (spl_can_catch_exception(intern->u.caching.flags)) {
zend_clear_exception();
} else {
return;
Expand Down
24 changes: 24 additions & 0 deletions ext/spl/tests/gh24264_1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--TEST--
GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveIteratorIterator hasChildren()
--FILE--
<?php

class ReproIterator extends RecursiveArrayIterator {
public function hasChildren(): bool {
echo "exit\n";
exit(1);
}
}

$it = new RecursiveIteratorIterator(
new ReproIterator([1]),
RecursiveIteratorIterator::LEAVES_ONLY,
RecursiveIteratorIterator::CATCH_GET_CHILD,
);

foreach ($it as $_) {}

echo "Not reached\n";
?>
--EXPECT--
exit
23 changes: 23 additions & 0 deletions ext/spl/tests/gh24264_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveCachingIterator hasChildren()
--FILE--
<?php

class ReproIterator extends RecursiveArrayIterator {
public function hasChildren(): bool {
echo "exit\n";
exit(1);
}
}

$it = new RecursiveCachingIterator(
new ReproIterator([1]),
CachingIterator::CATCH_GET_CHILD,
);

foreach ($it as $_) {}

echo "Not reached\n";
?>
--EXPECT--
exit
24 changes: 24 additions & 0 deletions ext/spl/tests/gh24264_3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--TEST--
GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveIteratorIterator getChildren()
--FILE--
<?php

class ReproIterator extends RecursiveArrayIterator {
public function getChildren(): ?RecursiveArrayIterator {
echo "exit\n";
exit(1);
}
}

$it = new RecursiveIteratorIterator(
new ReproIterator([[1]]),
RecursiveIteratorIterator::LEAVES_ONLY,
RecursiveIteratorIterator::CATCH_GET_CHILD,
);

foreach ($it as $_) {}

echo "Not reached\n";
?>
--EXPECT--
exit
23 changes: 23 additions & 0 deletions ext/spl/tests/gh24264_4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveCachingIterator getChildren()
--FILE--
<?php

class ReproIterator extends RecursiveArrayIterator {
public function getChildren(): ?RecursiveArrayIterator {
echo "exit\n";
exit(1);
}
}

$it = new RecursiveCachingIterator(
new ReproIterator([[1]]),
CachingIterator::CATCH_GET_CHILD,
);

foreach ($it as $_) {}

echo "Not reached\n";
?>
--EXPECT--
exit
35 changes: 35 additions & 0 deletions ext/spl/tests/gh24264_5.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
--TEST--
GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): destroyed fiber suspended in getChildren()
--FILE--
<?php

class ReproIterator extends RecursiveArrayIterator {
public function getChildren(): ?RecursiveArrayIterator {
try {
Fiber::suspend();
} finally {
echo "finally\n";
}
}
}

$fiber = new Fiber(function () {
$it = new RecursiveIteratorIterator(
new ReproIterator([[1], [2]]),
RecursiveIteratorIterator::LEAVES_ONLY,
RecursiveIteratorIterator::CATCH_GET_CHILD,
);

foreach ($it as $_) {}

echo "Not reached\n";
});

$fiber->start();
unset($fiber);

echo "Done\n";
?>
--EXPECT--
finally
Done
Loading