Skip to content

Fix GH-25228: Segfault in IteratorIterator with abstract IteratorAggregate #25230

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-25228: Segfault in IteratorIterator with abstract IteratorAggregate #25230

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
6 changes: 6 additions & 0 deletions ext/spl/spl_iterators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,12 @@ static zend_object_iterator *spl_recursive_it_get_iterator(zend_class_entry *ce,
static zend_result spl_get_iterator_from_aggregate(zval *retval, zend_class_entry *ce, zend_object *obj) {
zend_function **getiterator_cache =
ce->iterator_funcs_ptr ? &ce->iterator_funcs_ptr->zf_new_iterator : NULL;
if (getiterator_cache && ((*getiterator_cache)->common.fn_flags & ZEND_ACC_ABSTRACT)) {
zend_throw_error(NULL, "Cannot call abstract method %s::%s()",
ZSTR_VAL((*getiterator_cache)->common.scope->name),
ZSTR_VAL((*getiterator_cache)->common.function_name));
return FAILURE;
}
zend_call_method_with_0_params(obj, ce, getiterator_cache, "getiterator", retval);
if (EG(exception)) {
return FAILURE;
Expand Down
42 changes: 42 additions & 0 deletions ext/spl/tests/gh25228.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--TEST--
GH-25228 (Segfault in IteratorIterator::__construct() when $class is an abstract IteratorAggregate)
--FILE--
<?php

abstract class A implements IteratorAggregate {}
class B extends A {
public function getIterator(): Iterator {
return new ArrayIterator([1]);
}
}

abstract class C implements IteratorAggregate {
abstract public function getIterator(): Iterator;
}
class D extends C {
public function getIterator(): Iterator {
return new ArrayIterator([1]);
}
}

try {
new IteratorIterator(new B, 'A');
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

try {
new IteratorIterator(new D, 'C');
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

foreach (new IteratorIterator(new B, 'B') as $v) {
var_dump($v);
}

?>
--EXPECT--
Cannot call abstract method IteratorAggregate::getIterator()
Cannot call abstract method C::getIterator()
int(1)
Loading