dtor's may not be called from free_storage handlers

diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index c621bcb9005eda06602d4fe6af64988afbe5c26a..17d37da814eaa8dcbaa2055779cf31f17624df08 100755 (executable)
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
@@ -54,7 +54,7 @@ ZEND_API void zend_register_iterator_wrapper(TSRMLS_D)
        zend_iterator_class_entry.name = "__iterator_wrapper";
 }
 
-static void iter_wrapper_free_storage(zend_object *object TSRMLS_DC)
+static void iter_wrapper_dtor(void *object, zend_object_handle handle TSRMLS_DC)
 {
        zend_object_iterator *iter = (zend_object_iterator*)object;
        iter->funcs->dtor(iter TSRMLS_CC);
@@ -66,7 +66,7 @@ ZEND_API zval *zend_iterator_wrap(zend_object_iterator *iter TSRMLS_DC)
        
        MAKE_STD_ZVAL(wrapped);
        Z_TYPE_P(wrapped) = IS_OBJECT;
-       wrapped->value.obj.handle = zend_objects_store_put(iter, NULL, iter_wrapper_free_storage, NULL TSRMLS_CC);
+       wrapped->value.obj.handle = zend_objects_store_put(iter, iter_wrapper_dtor, NULL, NULL TSRMLS_CC);
        wrapped->value.obj.handlers = &iterator_object_handlers;
 
        return wrapped;