Fixed iterators API. zend_iterator_init() has to be used in each get_iterator() callback.

1 files changed, 1 insertions, 13 deletions

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index f1affbc01e..78cb346eb7 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -675,19 +675,7 @@ zend_object_iterator *zend_generator_get_iterator(zend_class_entry *ce, zval *ob
 
 	iterator = &generator->iterator;
 	
-//???
-#if 1
-	iterator->intern.std.gc.refcount = 1;
-	iterator->intern.std.gc.u.v.type = IS_OBJECT;
-	iterator->intern.std.gc.u.v.flags = 0;
-	iterator->intern.std.gc.u.v.buffer = 0;
-	iterator->intern.std.ce = NULL;
-	iterator->intern.std.properties = NULL;
-	iterator->intern.std.guards = NULL;
-	zend_objects_store_put(&iterator->intern.std);
-#else
-	zend_object_std_init(&iterator->intern.std, ???);
-#endif
+	zend_iterator_init(&iterator->intern TSRMLS_CC);
 
 	iterator->intern.funcs = &zend_generator_iterator_functions;
 	iterator->intern.data = (void *) generator;