summaryrefslogtreecommitdiff
path: root/Zend/zend_iterators.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-08-21 11:17:05 +0400
committerDmitry Stogov <dmitry@zend.com>2014-08-21 11:17:05 +0400
commit887c12da77bed4053314d35329692957cc5d9ed0 (patch)
treec1a6160fa238c671f406b63edf38f76ae07d2abf /Zend/zend_iterators.c
parentdde4d2e628bf4b23fea6df2ab6f05d27db5c0a1e (diff)
downloadphp-git-887c12da77bed4053314d35329692957cc5d9ed0.tar.gz
dtor handler must be set
Diffstat (limited to 'Zend/zend_iterators.c')
-rw-r--r--Zend/zend_iterators.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index faf4f91d84..7c08ac59b5 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);