tony2001 Tue Dec 20 12:41:38 2005 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
MFB: more SPL leak fixes
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.101&r2=1.102&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.101
php-src/ext/spl/spl_iterators.c:1.102
--- php-src/ext/spl/spl_iterators.c:1.101 Mon Dec 19 00:55:40 2005
+++ php-src/ext/spl/spl_iterators.c Tue Dec 20 12:41:38 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.101 2005/12/19 00:55:40 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.102 2005/12/20 12:41:38 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -372,6 +372,7 @@
zval *iterator;
zend_class_entry *ce_iterator;
long mode = RIT_LEAVES_ONLY, flags = 0;
+ int inc_refcount = 1;
php_set_error_handling(EH_THROW,
U_CLASS_ENTRY(spl_ce_InvalidArgumentException) TSRMLS_CC);
@@ -379,6 +380,7 @@
if (instanceof_function(Z_OBJCE_P(iterator),
U_CLASS_ENTRY(zend_ce_aggregate) TSRMLS_CC)) {
zval *aggregate = iterator;
zend_call_method_with_0_params(&aggregate,
Z_OBJCE_P(aggregate), &Z_OBJCE_P(aggregate)->iterator_funcs.zf_new_iterator,
"getiterator", &iterator);
+ inc_refcount = 0;
}
} else {
iterator = NULL;
@@ -428,7 +430,9 @@
}
ce_iterator = Z_OBJCE_P(iterator); /* respect inheritance, don't use
spl_ce_RecursiveIterator */
intern->iterators[0].iterator = ce_iterator->get_iterator(ce_iterator,
iterator TSRMLS_CC);
- iterator->refcount++;
+ if (inc_refcount) {
+ iterator->refcount++;
+ }
intern->iterators[0].zobject = iterator;
intern->iterators[0].ce = ce_iterator;
intern->iterators[0].state = RS_START;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
