com php-src: Fixed generator destruction: Zend/zend_generator s.c
| From: | Dmitry Stogov | Date: | Wed, 09 Apr 2014 06:47:03 +0000 |
| Subject: | com php-src: Fixed generator destruction: Zend/zend_generator s.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77478@lists.php.net to get a copy of this message | ||
Commit: c99b767537a17a832f4467ffb38a33223e0767d8
Author: Dmitry Stogov <dmitry@zend.com> Wed, 9 Apr 2014 10:47:03 +0400
Parents: 479f520d14ed221765af3ff5a3eb77dc54e1defa
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c99b767537a17a832f4467ffb38a33223e0767d8
Log:
Fixed generator destruction
Changed paths:
M Zend/zend_generators.c
Diff:
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 559e9f2..29941c1 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -597,8 +597,9 @@ ZEND_METHOD(Generator, __wakeup)
static void zend_generator_iterator_dtor(zend_object_iterator *iterator TSRMLS_DC) /* {{{ */
{
zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data);
- zval_ptr_dtor(&iterator->data);
generator->iterator = NULL;
+ zval_ptr_dtor(&iterator->data);
+ zend_iterator_dtor(iterator TSRMLS_CC);
}
/* }}} */