com php-src: dtor handler must be set: Zend/zend_iterators. c

Commit: 887c12da77bed4053314d35329692957cc5d9ed0 Author: Dmitry Stogov <dmitry@zend.com> Thu, 21 Aug 2014 11:17:05 +0400 Parents: dde4d2e628bf4b23fea6df2ab6f05d27db5c0a1e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=887c12da77bed4053314d35329692957cc5d9ed0 Log: dtor handler must be set Changed paths: M Zend/zend_iterators.c Diff: diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c index faf4f91..7c08ac5 100644 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c @@ -24,13 +24,14 @@ static zend_class_entry zend_iterator_class_entry; +static void iter_wrapper_free(zend_object *object TSRMLS_DC); static void iter_wrapper_dtor(zend_object *object TSRMLS_DC); static zend_object_handlers iterator_object_handlers = { 0, + iter_wrapper_free, iter_wrapper_dtor, NULL, - NULL, NULL, /* prop read */ NULL, /* prop write */ NULL, /* read dim */ @@ -58,12 +59,16 @@ ZEND_API void zend_register_iterator_wrapper(TSRMLS_D) INIT_CLASS_ENTRY(zend_iterator_class_entry, "__iterator_wrapper", NULL); } -static void iter_wrapper_dtor(zend_object *object TSRMLS_DC) +static void iter_wrapper_free(zend_object *object TSRMLS_DC) { zend_object_iterator *iter = (zend_object_iterator*)object; iter->funcs->dtor(iter TSRMLS_CC); } +static void iter_wrapper_dtor(zend_object *object TSRMLS_DC) +{ +} + ZEND_API void zend_iterator_init(zend_object_iterator *iter TSRMLS_DC) { zend_object_std_init(&iter->std, &zend_iterator_class_entry TSRMLS_CC);