Skip to content

Fix GH-25415: Segfault in FilterIterator::next() after failed parent ctor #25417

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

Open
lazerg wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
Open

Fix GH-25415: Segfault in FilterIterator::next() after failed parent ctor #25417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions ext/spl/spl_iterators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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() */
Expand All @@ -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();
Expand All @@ -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);
Expand All @@ -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);
} /* }}} */

Expand Down
69 changes: 69 additions & 0 deletions ext/spl/tests/gh25415.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
--TEST--
GH-25415 (Segfault in FilterIterator::next() after the subclass catches an exception from parent::__construct())
--CREDITS--
marinelay
--FILE--
<?php

function g() { yield 1; }

$gen = g();
foreach ($gen as $v) {}

$iterators = [
new class($gen) extends FilterIterator {
public function __construct(Iterator $it) {
try {
parent::__construct($it);
} catch (Exception $e) {
echo $e->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
Loading