clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4'

Browse Source 
* PHP-5.4:
  Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
This commit is contained in:
Xinchen Hui 2012-07-21 22:46:14 +08:00
commit a580405f38
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/spl/spl_iterators.c
View File

@ -1289,6 +1289,8 @@ static union _zend_function *spl_dual_it_get_method(zval **object_ptr, char *met
*object_ptr = intern->inner.zobject;
function_handler = Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, method_len, key TSRMLS_CC);
}
} else {
*object_ptr = intern->inner.zobject;
}
}
return function_handler;

15
ext/spl/tests/bug62616.phpt Normal file
View File

@ -0,0 +1,15 @@
--TEST--
Bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
--FILE--
<?php
$ai = new ArrayIterator(array(0,1));
var_dump($ai->count());
$ii = new IteratorIterator($ai);
var_dump($ii->count());
?>
--EXPECTF--
int(2)
int(2)