summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-06-30 17:33:51 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-06-30 17:33:51 +0200
commitaf4ff75c989374d2f850ae397d62d5a537532c40 (patch)
tree388408fce48a9a637d0e5079e2a2ad8f9ee94d93
parentb419f96c626d1f9cbbba42698e947e32a0af9c4f (diff)
parentd1be10dd7eb0a2a9c62e30136f954293673f3510 (diff)
downloadphp-git-af4ff75c989374d2f850ae397d62d5a537532c40.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Remove bogus generator iterator dtor
-rw-r--r--Zend/zend_generators.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 2e32301a9b..19a5e0665f 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -266,10 +266,6 @@ static void zend_generator_free_storage(zend_object *object) /* {{{ */
}
zend_object_std_dtor(&generator->std);
-
- if (generator->iterator) {
- zend_iterator_dtor(generator->iterator);
- }
}
/* }}} */