php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 00:48:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix leak in SPL iterators

Browse Source
This commit is contained in:
Antony Dovgal
2005-12-18 22:52:24 +00:00
parent 8aedeb8513
commit 9e8a1bfcbe
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/spl/spl_iterators.c
+5 -2
View File
@@ -814,7 +814,7 @@ static INLINE int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more T
static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_inner, dual_it_type dit_type)
{
zval *zobject;
zval *zobject, *retval = NULL;
spl_dual_it_object *intern;
zend_class_entry *ce;
@@ -882,7 +882,6 @@ static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAME
ce = *pce_cast;
}
if (instanceof_function(ce, zend_ce_aggregate TSRMLS_CC)) {
zval *retval;
zobject = zend_call_method_with_0_params(&zobject, ce, &ce->iterator_funcs.zf_new_iterator, "getiterator", &retval);
ce = Z_OBJCE_P(zobject);
}
@@ -911,6 +910,10 @@ static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAME
intern->inner.object = zend_object_store_get_object(zobject TSRMLS_CC);
intern->inner.iterator = intern->inner.ce->get_iterator(intern->inner.ce, zobject TSRMLS_CC);
if (retval) {
zval_ptr_dtor(&retval);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return intern;
}