Commit: 0b646e8027131a1fb127e1e6cc845319b65e46a4 Author: David Soria Parra <d...@php.net> Thu, 22 Mar 2012 12:13:31 +0100 Parents: 752fec88ef5ce15c750776d008ae843ee1ba761e Branches: PHP-5.4 5bf1efbf209b7d14edc8d01098465ed0bdda1516 ef678028bf8b9b3fde0d609328c2722040fba269 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0b646e8027131a1fb127e1e6cc845319b65e46a4 Log: Revert "Fixed reference counting" This reverts commit 752fec88ef5ce15c750776d008ae843ee1ba761e. Changed paths: M ext/spl/spl_directory.c Diff: 0b646e8027131a1fb127e1e6cc845319b65e46a4 diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 7bd340b..c6eec94 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1655,8 +1655,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; } @@ -1858,8 +1858,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
