helly Sat May 20 18:48:43 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
- No need to keep object alive, iterator api is taking care of that already
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.129&r2=1.130&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.129
php-src/ext/spl/spl_iterators.c:1.130
--- php-src/ext/spl/spl_iterators.c:1.129 Sat May 20 13:23:00 2006
+++ php-src/ext/spl/spl_iterators.c Sat May 20 18:48:43 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.129 2006/05/20 13:23:00 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.130 2006/05/20 18:48:43 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -2405,7 +2405,6 @@
{
zend_object_iterator *iter;
- obj->refcount++;
iter = Z_OBJCE_P(obj)->get_iterator(Z_OBJCE_P(obj), obj, 0 TSRMLS_CC);
if (EG(exception)) {
@@ -2434,9 +2433,6 @@
done:
iter->funcs->dtor(iter TSRMLS_CC);
- if (obj->refcount > 0 && !EG(exception)) {
- zval_ptr_dtor(&obj);
- }
return EG(exception) ? FAILURE : SUCCESS;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
