tony2001 Sun Dec 18 22:53:18 2005 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
MFB: fix leak in SPL iterators
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.99&r2=1.100&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.99
php-src/ext/spl/spl_iterators.c:1.100
--- php-src/ext/spl/spl_iterators.c:1.99 Tue Dec 6 02:00:07 2005
+++ php-src/ext/spl/spl_iterators.c Sun Dec 18 22:53:18 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.99 2005/12/06 02:00:07 sniper Exp $ */
+/* $Id: spl_iterators.c,v 1.100 2005/12/18 22:53:18 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -828,7 +828,7 @@
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;
@@ -898,7 +898,6 @@
ce = *pce_cast;
}
if (instanceof_function(ce,
U_CLASS_ENTRY(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);
}
@@ -944,6 +943,10 @@
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
