From a8a8ebe26c5ea882eba83e71ed88ff0a7313ed3a Mon Sep 17 00:00:00 2001 From: lazerg Date: Thu, 12 Nov 2026 16:52:40 +0500 Subject: [PATCH 1/2] Fix GH-25415: Segfault in FilterIterator::next() after failed parent ctor --- ext/spl/spl_iterators.c | 14 ++++++-- ext/spl/tests/gh25415.phpt | 69 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 ext/spl/tests/gh25415.phpt diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 05bdfdb34ba3..a61195fb12d4 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1541,7 +1541,8 @@ static inline void spl_dual_it_next(spl_dual_it_object *intern, int do_free) { if (do_free) { spl_dual_it_free(intern); - } else if (!intern->inner.iterator) { + } + if (!intern->inner.iterator) { zend_throw_error(NULL, "The inner constructor wasn't initialized with an iterator instance"); return; } @@ -2692,7 +2693,7 @@ PHP_METHOD(NoRewindIterator, valid) ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); - RETURN_BOOL(intern->inner.iterator->funcs->valid(intern->inner.iterator) == SUCCESS); + RETURN_BOOL(spl_dual_it_valid(intern) == SUCCESS); } /* }}} */ /* {{{ Return inner iterators key() */ @@ -2704,7 +2705,7 @@ PHP_METHOD(NoRewindIterator, key) SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); - if (intern->inner.iterator->funcs->get_current_key) { + if (intern->inner.iterator && intern->inner.iterator->funcs->get_current_key) { intern->inner.iterator->funcs->get_current_key(intern->inner.iterator, return_value); } else { RETURN_NULL(); @@ -2720,6 +2721,9 @@ PHP_METHOD(NoRewindIterator, current) ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); + if (!intern->inner.iterator) { + RETURN_NULL(); + } data = intern->inner.iterator->funcs->get_current_data(intern->inner.iterator); if (data) { RETURN_COPY_DEREF(data); @@ -2734,6 +2738,10 @@ PHP_METHOD(NoRewindIterator, next) ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); + if (!intern->inner.iterator) { + zend_throw_error(NULL, "The inner constructor wasn't initialized with an iterator instance"); + RETURN_THROWS(); + } intern->inner.iterator->funcs->move_forward(intern->inner.iterator); } /* }}} */ diff --git a/ext/spl/tests/gh25415.phpt b/ext/spl/tests/gh25415.phpt new file mode 100644 index 000000000000..015e97ac8b12 --- /dev/null +++ b/ext/spl/tests/gh25415.phpt @@ -0,0 +1,69 @@ +--TEST-- +GH-25415 (Segfault in FilterIterator::next() after the subclass catches an exception from parent::__construct()) +--CREDITS-- +marinelay +--FILE-- +getMessage(), "\n"; + } + } + public function accept(): bool { return true; } + }, + new class($gen) extends IteratorIterator { + public function __construct(Iterator $it) { + try { + parent::__construct($it); + } catch (Exception $e) { + echo $e->getMessage(), "\n"; + } + } + }, + new class($gen) extends NoRewindIterator { + public function __construct(Iterator $it) { + try { + parent::__construct($it); + } catch (Exception $e) { + echo $e->getMessage(), "\n"; + } + } + }, +]; + +foreach ($iterators as $it) { + var_dump($it->valid(), $it->key(), $it->current()); + try { + $it->next(); + } catch (Error $e) { + echo $e->getMessage(), "\n"; + } +} + +?> +--EXPECT-- +Cannot traverse an already closed generator +Cannot traverse an already closed generator +Cannot traverse an already closed generator +bool(false) +NULL +NULL +The inner constructor wasn't initialized with an iterator instance +bool(false) +NULL +NULL +The inner constructor wasn't initialized with an iterator instance +bool(false) +NULL +NULL +The inner constructor wasn't initialized with an iterator instance From e1cc0c7ce73505d3e4b3292139d5f4b78f28f574 Mon Sep 17 00:00:00 2001 From: lazerg Date: Fri, 13 Nov 2026 23:12:27 +0500 Subject: [PATCH 2/2] Check the inner iterator in SPL_FETCH_AND_CHECK_DUAL_IT --- ext/spl/spl_iterators.c | 16 ++++------------ ext/spl/tests/gh25415.phpt | 35 ++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index a61195fb12d4..6eb2c6ad3807 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -154,7 +154,7 @@ static inline spl_dual_it_object *spl_dual_it_from_obj(zend_object *obj) /* {{{ #define SPL_FETCH_AND_CHECK_DUAL_IT(var, objzval) \ do { \ spl_dual_it_object *it = Z_SPLDUAL_IT_P(objzval); \ - if (it->dit_type == DIT_Unknown) { \ + if (it->dit_type == DIT_Unknown || (!it->inner.iterator && it->dit_type != DIT_AppendIterator)) { \ zend_throw_error(NULL, "The object is in an invalid state as the parent constructor was not called"); \ RETURN_THROWS(); \ } \ @@ -1541,8 +1541,7 @@ static inline void spl_dual_it_next(spl_dual_it_object *intern, int do_free) { if (do_free) { spl_dual_it_free(intern); - } - if (!intern->inner.iterator) { + } else if (!intern->inner.iterator) { zend_throw_error(NULL, "The inner constructor wasn't initialized with an iterator instance"); return; } @@ -2693,7 +2692,7 @@ PHP_METHOD(NoRewindIterator, valid) ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); - RETURN_BOOL(spl_dual_it_valid(intern) == SUCCESS); + RETURN_BOOL(intern->inner.iterator->funcs->valid(intern->inner.iterator) == SUCCESS); } /* }}} */ /* {{{ Return inner iterators key() */ @@ -2705,7 +2704,7 @@ PHP_METHOD(NoRewindIterator, key) SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); - if (intern->inner.iterator && intern->inner.iterator->funcs->get_current_key) { + if (intern->inner.iterator->funcs->get_current_key) { intern->inner.iterator->funcs->get_current_key(intern->inner.iterator, return_value); } else { RETURN_NULL(); @@ -2721,9 +2720,6 @@ PHP_METHOD(NoRewindIterator, current) ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); - if (!intern->inner.iterator) { - RETURN_NULL(); - } data = intern->inner.iterator->funcs->get_current_data(intern->inner.iterator); if (data) { RETURN_COPY_DEREF(data); @@ -2738,10 +2734,6 @@ PHP_METHOD(NoRewindIterator, next) ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); - if (!intern->inner.iterator) { - zend_throw_error(NULL, "The inner constructor wasn't initialized with an iterator instance"); - RETURN_THROWS(); - } intern->inner.iterator->funcs->move_forward(intern->inner.iterator); } /* }}} */ diff --git a/ext/spl/tests/gh25415.phpt b/ext/spl/tests/gh25415.phpt index 015e97ac8b12..036cdeb504fc 100644 --- a/ext/spl/tests/gh25415.phpt +++ b/ext/spl/tests/gh25415.phpt @@ -42,11 +42,12 @@ $iterators = [ ]; foreach ($iterators as $it) { - var_dump($it->valid(), $it->key(), $it->current()); - try { - $it->next(); - } catch (Error $e) { - echo $e->getMessage(), "\n"; + foreach (['valid', 'key', 'current', 'next'] as $method) { + try { + $it->$method(); + } catch (Error $e) { + echo $e->getMessage(), "\n"; + } } } @@ -55,15 +56,15 @@ foreach ($iterators as $it) { Cannot traverse an already closed generator Cannot traverse an already closed generator Cannot traverse an already closed generator -bool(false) -NULL -NULL -The inner constructor wasn't initialized with an iterator instance -bool(false) -NULL -NULL -The inner constructor wasn't initialized with an iterator instance -bool(false) -NULL -NULL -The inner constructor wasn't initialized with an iterator instance +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called +The object is in an invalid state as the parent constructor was not called