com php-src: Fixed iterators: ext/intl/breakiterator/breakitera tor_iterators.cpp ext/intl/common/common_enum.cpp

Commit: 7d492e3fd4b4964faa6155ad5335ac4689278476 Author: Xinchen Hui <laruence@php.net> Sun, 29 Jun 2014 21:54:39 +0800 Parents: cdff5775dd65772616db8fc93289daafd4a12107 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7d492e3fd4b4964faa6155ad5335ac4689278476 Log: Fixed iterators Changed paths: M ext/intl/breakiterator/breakiterator_iterators.cpp M ext/intl/common/common_enum.cpp Diff: diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp b/ext/intl/breakiterator/breakiterator_iterators.cpp index 0bfe6cf..7783235 100644 --- a/ext/intl/breakiterator/breakiterator_iterators.cpp +++ b/ext/intl/breakiterator/breakiterator_iterators.cpp @@ -217,7 +217,7 @@ void IntlIterator_from_BreakIterator_parts(zval *break_iter_zv, ii = Z_INTL_ITERATOR_P(object); ii->iterator = (zend_object_iterator*)emalloc(sizeof(zoi_break_iter_parts)); - //zend_iterator_init(ii->iterator TSRMLS_CC); + zend_iterator_init(ii->iterator TSRMLS_CC); ZVAL_COPY(&ii->iterator->data, break_iter_zv); ii->iterator->funcs = &breakiterator_parts_it_funcs; diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp index e9d052d..ff28bdb 100644 --- a/ext/intl/common/common_enum.cpp +++ b/ext/intl/common/common_enum.cpp @@ -143,7 +143,7 @@ U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *ob object_init_ex(object, IntlIterator_ce_ptr); ii = Z_INTL_ITERATOR_P(object); ii->iterator = (zend_object_iterator*)emalloc(sizeof(zoi_with_current)); - //????????? dtor zend_iterator_init(ii->iterator TSRMLS_CC); + zend_iterator_init(ii->iterator TSRMLS_CC); ZVAL_PTR(&ii->iterator->data, se); ii->iterator->funcs = &string_enum_object_iterator_funcs; ii->iterator->index = 0; @@ -159,7 +159,7 @@ static void IntlIterator_objects_free(zend_object *object TSRMLS_DC) if (ii->iterator) { zval *wrapping_objp = &((zoi_with_current*)ii->iterator)->wrapping_obj; ZVAL_UNDEF(wrapping_objp); - ii->iterator->funcs->dtor(ii->iterator TSRMLS_CC); + zend_iterator_dtor(ii->iterator TSRMLS_CC); } intl_error_reset(INTLITERATOR_ERROR_P(ii) TSRMLS_CC); @@ -183,7 +183,7 @@ static zend_object_iterator *IntlIterator_get_iterator( return NULL; } - zval_add_ref(object); + ++GC_REFCOUNT(ii->iterator); return ii->iterator; }