diff options
Diffstat (limited to 'Zend/zend_iterators.c')
| -rw-r--r-- | Zend/zend_iterators.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c index a2854c4b74..faf4f91d84 100644 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c @@ -24,8 +24,13 @@ static zend_class_entry zend_iterator_class_entry; +static void iter_wrapper_dtor(zend_object *object TSRMLS_DC); + static zend_object_handlers iterator_object_handlers = { - ZEND_OBJECTS_STORE_HANDLERS, + 0, + iter_wrapper_dtor, + NULL, + NULL, NULL, /* prop read */ NULL, /* prop write */ NULL, /* read dim */ @@ -51,26 +56,27 @@ static zend_object_handlers iterator_object_handlers = { ZEND_API void zend_register_iterator_wrapper(TSRMLS_D) { INIT_CLASS_ENTRY(zend_iterator_class_entry, "__iterator_wrapper", NULL); - str_free(zend_iterator_class_entry.name); - zend_iterator_class_entry.name = "__iterator_wrapper"; } -static void iter_wrapper_dtor(void *object, zend_object_handle handle TSRMLS_DC) +static void iter_wrapper_dtor(zend_object *object TSRMLS_DC) { zend_object_iterator *iter = (zend_object_iterator*)object; iter->funcs->dtor(iter TSRMLS_CC); } -ZEND_API zval *zend_iterator_wrap(zend_object_iterator *iter TSRMLS_DC) +ZEND_API void zend_iterator_init(zend_object_iterator *iter TSRMLS_DC) { - zval *wrapped; + zend_object_std_init(&iter->std, &zend_iterator_class_entry TSRMLS_CC); + iter->std.handlers = &iterator_object_handlers; +} - MAKE_STD_ZVAL(wrapped); - Z_TYPE_P(wrapped) = IS_OBJECT; - Z_OBJ_HANDLE_P(wrapped) = zend_objects_store_put(iter, iter_wrapper_dtor, NULL, NULL TSRMLS_CC); - Z_OBJ_HT_P(wrapped) = &iterator_object_handlers; +ZEND_API void zend_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) +{ + if (--GC_REFCOUNT(iter) > 0) { + return; + } - return wrapped; + zend_objects_store_del(&iter->std TSRMLS_CC); } ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap( @@ -79,7 +85,7 @@ ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap( switch (Z_TYPE_P(array_ptr)) { case IS_OBJECT: if (Z_OBJ_HT_P(array_ptr) == &iterator_object_handlers) { - *iter = (zend_object_iterator *)zend_object_store_get_object(array_ptr TSRMLS_CC); + *iter = (zend_object_iterator *)Z_OBJ_P(array_ptr); return ZEND_ITER_OBJECT; } if (Z_OBJPROP_P(array_ptr)) { |