helly Thu Dec 22 00:06:38 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl spl_iterators.c
Log:
- Fix memleak
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.12&r2=1.73.2.13&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.12
php-src/ext/spl/spl_iterators.c:1.73.2.13
--- php-src/ext/spl/spl_iterators.c:1.73.2.12 Tue Dec 20 12:41:24 2005
+++ php-src/ext/spl/spl_iterators.c Thu Dec 22 00:06:38 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.12 2005/12/20 12:41:24 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.13 2005/12/22 00:06:38 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1900,7 +1900,10 @@
intern->inner.zobject = NULL;
intern->inner.ce = NULL;
intern->inner.object = NULL;
- intern->inner.iterator = NULL;
+ if (intern->inner.iterator) {
+
intern->inner.iterator->funcs->dtor(intern->inner.iterator TSRMLS_CC);
+ intern->inner.iterator = NULL;
+ }
}
if (intern->u.append.iterator->funcs->valid(intern->u.append.iterator
TSRMLS_CC) == SUCCESS) {
zval **it;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
