From: Antony Dovgal <tony2001@php.net>
Date: Sun, 18 Dec 2005 22:52:24 +0000 (+0000)
Subject: fix leak in SPL iterators
X-Git-Tag: php-5.1.2RC1~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e8a1bfcbe23bd63e61642dee4060184dbc6d2dd;p=php

fix leak in SPL iterators
---

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 572f06e3d8..43ff9916f7 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -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;
 }