php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 17:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed Bug #37457 (Crash when an exception is thrown in accept() method of FilterIterator)

Browse Source
This commit is contained in:
Marcus Boerger
2006-05-16 08:19:56 +00:00
parent cccca0943a
commit 59bf03c6a8
2 changed files with 88 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/spl/spl_iterators.c
View File

@@ -1184,7 +1184,9 @@ static inline void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern T
}
zval_ptr_dtor(&retval);
}
if (EG(exception)) {
return;
}
intern->inner.iterator->funcs->move_forward(intern->inner.iterator TSRMLS_CC);
}
spl_dual_it_free(intern TSRMLS_CC);
@@ -1664,11 +1666,14 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
zend_call_method_with_0_params(&intern->inner.zobject, intern->inner.ce, NULL, "haschildren", &retval);
if (zend_is_true(retval)) {
zend_call_method_with_0_params(&intern->inner.zobject, intern->inner.ce, NULL, "getchildren", &zchildren);
if (EG(exception) && intern->u.caching.flags & CIT_CATCH_GET_CHILD) {
zend_clear_exception(TSRMLS_C);
if (EG(exception)) {
if (zchildren) {
zval_ptr_dtor(&zchildren);
}
if (intern->u.caching.flags & CIT_CATCH_GET_CHILD) {
zend_clear_exception(TSRMLS_C);
}
return;
} else {
INIT_PZVAL(&zflags);
ZVAL_LONG(&zflags, intern->u.caching.flags & CIT_PUBLIC);

80
ext/spl/tests/bug37457.phpt Executable file
View File

@@ -0,0 +1,80 @@
--TEST--
Bug #37457 (Crash when an exception is thrown in accept() method of FilterIterator)
--FILE--
<?php
class Collection implements Iterator
{
protected $array, $valid = false;
public function __construct(array $a)
{
echo __METHOD__ . "\n";
$this->array = $a;
}
public function current()
{
echo __METHOD__ . "\n";
return current($this->array);
}
public function key()
{
echo __METHOD__ . "\n";
return key($this->array);
}
public function next()
{
echo __METHOD__ . "\n";
$this->valid = (false !== next($this->array));
}
public function valid()
{
echo __METHOD__ . "\n";
return $this->valid;
}
public function rewind()
{
echo __METHOD__ . "\n";
$this->valid = (false !== reset($this->array));
}
}
class TestFilter extends FilterIterator
{
public function accept()
{
echo __METHOD__ . "\n";
throw new Exception("Failure in Accept");
}
}
$test = new TestFilter(new Collection(array(0)));
try
{
foreach ($test as $item)
{
echo $item;
}
}
catch (Exception $e)
{
var_dump($e->getMessage());
}
?>
===DONE===
--EXPECTF--
Collection::__construct
Collection::rewind
Collection::valid
Collection::current
Collection::key
TestFilter::accept
string(17) "Failure in Accept"
===DONE===