diff options
| author | Remi Collet <remi@remirepo.net> | 2019-09-11 07:59:50 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-09-11 07:59:50 +0200 |
| commit | 4dc4a2dd4fa94e460b00fa4eff96a5ac2e9d66e4 (patch) | |
| tree | d499bf3da2ebc620c2b7c55c292e703c19f9d05d /php-bug78412.patch | |
| parent | 0760a112f4ab67a829862bb3eb0cad9e653cbc42 (diff) | |
v7.2.23RC1
Diffstat (limited to 'php-bug78412.patch')
| -rw-r--r-- | php-bug78412.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/php-bug78412.patch b/php-bug78412.patch deleted file mode 100644 index f4f8b4a..0000000 --- a/php-bug78412.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - |