Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit d1be10dd7eb0 · 2020-06-30T17:33:33.000+02:00
* PHP-7.3:
  Remove bogus generator iterator dtor
diff --git 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);
-	}
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -271,10 +271,6 @@ static void zend_generator_free_storage(zend_object object) / {{{ */`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`zend_object_std_dtor(&generator->std);`
`274`		`-`
`275`		`- if (generator->iterator) {`
`276`		`- zend_iterator_dtor(generator->iterator);`
`277`		`- }`
`278`	`274`	`}`
`279`	`275`	`/* }}} */`
`280`	`276`