[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6

From: Date: Sun, 25 Oct 2026 11:52:43 +0000
Subject: [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142711@lists.php.net to get a copy of this message
Author: ndossche (ndossche) Date: 2026-10-25T12:52:28+01:00 Commit: https://github.com/php/php-src/commit/e284d8c25bdd0790f78cafd375e0b983272265c6 Raw diff: https://github.com/php/php-src/commit/e284d8c25bdd0790f78cafd375e0b983272265c6.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: Fix GH-24264: Unwind/GracefulExit discarded in spl_iterators.c Changed paths: A ext/spl/tests/gh24264_1.phpt A ext/spl/tests/gh24264_2.phpt A ext/spl/tests/gh24264_3.phpt A ext/spl/tests/gh24264_4.phpt A ext/spl/tests/gh24264_5.phpt M NEWS M ext/spl/spl_iterators.c Diff: diff --git a/NEWS b/NEWS index b487df48dde4..1d89beaec1ae 100644 --- a/NEWS +++ b/NEWS @@ -35,6 +35,10 @@ PHP NEWS . Fixed infinite loop in sapi_header_op() for headers of 4 GiB or more. (Martin Mirchev) +- SPL: + . Fixed bug GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c). + (Lazizbek Ergashev) + - Standard: . Fixed bug GH-24308 (Request shutdown calls closelog() even when syslog was not opened by PHP). (lazerg) diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index dfcde994a5c5..94c89448d540 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -244,6 +244,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; @@ -264,7 +271,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(); @@ -301,7 +308,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 { @@ -337,7 +344,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(); @@ -366,7 +373,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(); @@ -410,7 +417,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv if (object->beginChildren) { zend_call_known_function(object->beginChildren, Z_OBJ_P(zthis), object->ce, NULL, 0, NULL, NULL); if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { return; } else { zend_clear_exception(); @@ -424,7 +431,7 @@ static void spl_recursive_it_move_forward_ex(spl_recursive_it_object *object, zv if (object->endChildren) { zend_call_known_function(object->endChildren, Z_OBJ_P(zthis), object->ce, NULL, 0, NULL, NULL); if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { return; } else { zend_clear_exception(); @@ -2275,7 +2282,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; @@ -2291,7 +2298,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; @@ -2308,7 +2315,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; diff --git a/ext/spl/tests/gh24264_1.phpt b/ext/spl/tests/gh24264_1.phpt new file mode 100644 index 000000000000..dd0005a81589 --- /dev/null +++ b/ext/spl/tests/gh24264_1.phpt @@ -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 diff --git a/ext/spl/tests/gh24264_2.phpt b/ext/spl/tests/gh24264_2.phpt new file mode 100644 index 000000000000..d71c282a6410 --- /dev/null +++ b/ext/spl/tests/gh24264_2.phpt @@ -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 diff --git a/ext/spl/tests/gh24264_3.phpt b/ext/spl/tests/gh24264_3.phpt new file mode 100644 index 000000000000..985ef5399e14 --- /dev/null +++ b/ext/spl/tests/gh24264_3.phpt @@ -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 diff --git a/ext/spl/tests/gh24264_4.phpt b/ext/spl/tests/gh24264_4.phpt new file mode 100644 index 000000000000..b59950bc2a54 --- /dev/null +++ b/ext/spl/tests/gh24264_4.phpt @@ -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 diff --git a/ext/spl/tests/gh24264_5.phpt b/ext/spl/tests/gh24264_5.phpt new file mode 100644 index 000000000000..620ee4a43403 --- /dev/null +++ b/ext/spl/tests/gh24264_5.phpt @@ -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

« previous php.cvs (#142711) next »