diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-05-31 00:04:52 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-05-31 00:04:52 +0300 |
| commit | f216176bc952bab346ed075b758c7e5eaaacaee0 (patch) | |
| tree | 92a8aef42b19363e755b0201b8c5f377e4b18189 | |
| parent | 6bd3b8108a49374760f0571a26af9435817378d5 (diff) | |
| download | php-git-f216176bc952bab346ed075b758c7e5eaaacaee0.tar.gz | |
Initialize only the necessary fields.
| -rw-r--r-- | Zend/zend_vm_def.h | 4 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c8eb4cba4c..82ba60a03b 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4038,7 +4038,9 @@ ZEND_VM_HANDLER(41, ZEND_GENERATOR_CREATE, ANY, ANY) generator = (zend_generator *) Z_OBJ_P(EX(return_value)); generator->execute_data = gen_execute_data; generator->frozen_call_stack = NULL; - memset(&generator->execute_fake, 0, sizeof(zend_execute_data)); + generator->execute_fake.opline = NULL; + generator->execute_fake.func = NULL; + generator->execute_fake.prev_execute_data = NULL; ZVAL_OBJ(&generator->execute_fake.This, (zend_object *) generator); gen_execute_data->opline = opline + 1; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2b9727acd2..3351a078b2 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1179,7 +1179,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GENERATOR_CREATE_SPEC_HANDLER( generator = (zend_generator *) Z_OBJ_P(EX(return_value)); generator->execute_data = gen_execute_data; generator->frozen_call_stack = NULL; - memset(&generator->execute_fake, 0, sizeof(zend_execute_data)); + generator->execute_fake.opline = NULL; + generator->execute_fake.func = NULL; + generator->execute_fake.prev_execute_data = NULL; ZVAL_OBJ(&generator->execute_fake.This, (zend_object *) generator); gen_execute_data->opline = opline + 1; |