archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)

Browse source
This commit is contained in:
Xinchen Hui 2012-07-21 23:26:18 +08:00
parent 683b4f7a2b
commit cc30524c89
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -13,6 +13,10 @@ PHP NEWS
- DateTime: - DateTime:
. Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence) . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)
- SPL:
. Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
gives Segmentation fault). (Laruence, Gustavo)
14 Jun 2012, PHP 5.3.14 14 Jun 2012, PHP 5.3.14
- CLI SAPI: - CLI SAPI:

2
ext/spl/spl_iterators.c
View file

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