blob: f4f8b4af3e220f09554f72e95ad7830d45959879 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From fcabe7e5e44067319f9c4123d71a7cea6a823af4 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 14 Aug 2019 17:48:57 +0200
Subject: [PATCH] Fixed bug #78412
$this should only be included in the generator GC buffer, if it
will be released on destruction.
---
NEWS | 4 ++++
Zend/zend_generators.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 666a12f..042ddbc 100644
--- 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) {
--
2.1.4
|
