summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-06-30 17:33:33 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-06-30 17:33:33 +0200
commitd1be10dd7eb0a2a9c62e30136f954293673f3510 (patch)
treed3559a4174ba929f5d84e16f79b99a1d8e73f81c
parent0fa70b3cdef6ebe70a0cb68ec6c795c45f17bdf2 (diff)
parent187a72d563914a0f9a0f97d26956aff4fb5c3fe6 (diff)
downloadphp-git-d1be10dd7eb0a2a9c62e30136f954293673f3510.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: 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 15bbfca1c5..80d11cfe4a 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -271,10 +271,6 @@ static void zend_generator_free_storage(zend_object *object) /* {{{ */
}
zend_object_std_dtor(&generator->std);
-
- if (generator->iterator) {
- zend_iterator_dtor(generator->iterator);
- }
}
/* }}} */