Fixed bug #78412

nikic · nikic · commit fcabe7e5e440 · 2019-08-14T17:50:58.000+02:00
$this should only be included in the generator GC buffer, if it
will be released on destruction.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2019, PHP 7.2.23
 
+- Core:
+  . Fixed bug #78412 (Generator incorrectly reports non-releasable $this as GC
+    child). (Nikita)
+
 29 Aug 2019, PHP 7.2.22
 
 - Core:
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
@@ -271,7 +271,7 @@ static uint32_t calc_gc_buffer_size(zend_generator *generator) /* {{{ */
 		if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) {
 			size += EX_NUM_ARGS() - op_array->num_args;
 		}
-		size += Z_TYPE(execute_data->This) == IS_OBJECT; /* $this */
+		size += (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) != 0; /* $this */
 		size += (EX_CALL_INFO() & ZEND_CALL_CLOSURE) != 0; /* Closure object */
 
 		/* Live vars */
@@ -352,7 +352,7 @@ static HashTable *zend_generator_get_gc(zval *object, zval **table, int *n) /* {
 		}
 	}
 
-	if (Z_TYPE(execute_data->This) == IS_OBJECT) {
+	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
 		ZVAL_OBJ(gc_buffer++, Z_OBJ(execute_data->This));
 	}
 	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ static uint32_t calc_gc_buffer_size(zend_generator generator) / {{{ */`
`271`	`271`	`if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) {`
`272`	`272`	`size += EX_NUM_ARGS() - op_array->num_args;`
`273`	`273`	`}`
`274`		`- size += Z_TYPE(execute_data->This) == IS_OBJECT; /* $this */`
	`274`	`+ size += (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) != 0; /* $this */`
`275`	`275`	`size += (EX_CALL_INFO() & ZEND_CALL_CLOSURE) != 0; /* Closure object */`
`276`	`276`
`277`	`277`	`/* Live vars */`
`@@ -352,7 +352,7 @@ static HashTable zend_generator_get_gc(zval object, zval *table, int n) /* {`
`352`	`352`	`}`
`353`	`353`	`}`
`354`	`354`
`355`		`- if (Z_TYPE(execute_data->This) == IS_OBJECT) {`
	`355`	`+ if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {`
`356`	`356`	`ZVAL_OBJ(gc_buffer++, Z_OBJ(execute_data->This));`
`357`	`357`	`}`
`358`	`358`	`if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {`