helly Mon Dec 19 00:32:51 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/spl spl_iterators.c Log: - Fix reference counting http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.9&r2=1.73.2.10&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.73.2.9 php-src/ext/spl/spl_iterators.c:1.73.2.10 --- php-src/ext/spl/spl_iterators.c:1.73.2.9 Sun Dec 18 22:52:24 2005 +++ php-src/ext/spl/spl_iterators.c Mon Dec 19 00:32:51 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.73.2.9 2005/12/18 22:52:24 tony2001 Exp $ */ +/* $Id: spl_iterators.c,v 1.73.2.10 2005/12/19 00:32:51 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -817,6 +817,7 @@ zval *zobject, *retval = NULL; spl_dual_it_object *intern; zend_class_entry *ce; + int inc_refcount = 1; php_set_error_handling(EH_THROW, spl_ce_InvalidArgumentException TSRMLS_CC); @@ -884,6 +885,7 @@ if (instanceof_function(ce, zend_ce_aggregate TSRMLS_CC)) { zobject = zend_call_method_with_0_params(&zobject, ce, &ce->iterator_funcs.zf_new_iterator, "getiterator", &retval); ce = Z_OBJCE_P(zobject); + inc_refcount = 0; } } break; @@ -904,16 +906,14 @@ php_set_error_handling(EH_THROW, zend_exception_get_default() TSRMLS_CC); - zobject->refcount++; + if (inc_refcount) { + zobject->refcount++; + } intern->inner.zobject = zobject; intern->inner.ce = dit_type == DIT_IteratorIterator ? ce : Z_OBJCE_P(zobject); 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