Commit: 672fe54a00a97509c1ea08c450fe1597201c354d Author: Dmitry Stogov <dmi...@zend.com> Thu, 22 Mar 2012 15:51:58 +0400 Parents: 14af1fe6923c65a91cd77eab5a8d4326f854391d Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=672fe54a00a97509c1ea08c450fe1597201c354d Log: Revert "Fixed reference counting" This reverts commit 14af1fe6923c65a91cd77eab5a8d4326f854391d. Changed paths: M ext/spl/spl_directory.c Diff: 672fe54a00a97509c1ea08c450fe1597201c354d diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 9d454c9..fb19823 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1644,8 +1644,8 @@ zend_object_iterator *spl_filesystem_dir_get_iterator(zend_class_entry *ce, zval /* ->current must be initialized; rewind doesn't set it and valid * doesn't check whether it's set */ iterator->current = object; - Z_SET_REFCOUNT_P(object, Z_REFCOUNT_P(object) + 2); } + zval_add_ref(&object); return (zend_object_iterator*)iterator; } @@ -1847,8 +1847,8 @@ zend_object_iterator *spl_filesystem_tree_get_iterator(zend_class_entry *ce, zva if (iterator->intern.data == NULL) { iterator->intern.data = object; iterator->intern.funcs = &spl_filesystem_tree_it_funcs; - zval_add_ref(&object); } + zval_add_ref(&object); return (zend_object_iterator*)iterator; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
