diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-31 01:00:12 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-31 01:00:12 +0300 |
| commit | f43e483ffb6eed6c09ef599552ba7da806bf2473 (patch) | |
| tree | 71ee18553ce9f20c116bf696406ab87f86c43861 | |
| parent | d7710ef5170998859e256e74b6c19c6d051aabca (diff) | |
| parent | 2915a32f374f8ec60915cf7398d5227d9bda43cd (diff) | |
| download | php-git-f43e483ffb6eed6c09ef599552ba7da806bf2473.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed compilation warning
| -rw-r--r-- | Zend/zend_vm_def.h | 7 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 82e7f76ab8..45be4fc09c 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -5957,7 +5957,7 @@ ZEND_VM_COLD_HANDLER(179, ZEND_UNSET_STATIC_PROP, ANY, ANY, CACHE_SLOT) { USE_OPLINE zval *varname; - zend_string *name, *tmp_name; + zend_string *name, *tmp_name = NULL; zend_class_entry *ce; zend_free_op free_op1; @@ -5990,7 +5990,6 @@ ZEND_VM_COLD_HANDLER(179, ZEND_UNSET_STATIC_PROP, ANY, ANY, CACHE_SLOT) name = Z_STR_P(varname); } else if (EXPECTED(Z_TYPE_P(varname) == IS_STRING)) { name = Z_STR_P(varname); - tmp_name = NULL; } else { if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) { varname = ZVAL_UNDEFINED_OP1(); @@ -6000,9 +5999,7 @@ ZEND_VM_COLD_HANDLER(179, ZEND_UNSET_STATIC_PROP, ANY, ANY, CACHE_SLOT) zend_std_unset_static_property(ce, name); - if (OP1_TYPE != IS_CONST) { - zend_tmp_string_release(tmp_name); - } + zend_tmp_string_release(tmp_name); FREE_OP1(); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index ef56045303..72c7fe4529 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1909,7 +1909,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_STATIC_PROP { USE_OPLINE zval *varname; - zend_string *name, *tmp_name; + zend_string *name, *tmp_name = NULL; zend_class_entry *ce; zend_free_op free_op1; @@ -1942,7 +1942,6 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_STATIC_PROP name = Z_STR_P(varname); } else if (EXPECTED(Z_TYPE_P(varname) == IS_STRING)) { name = Z_STR_P(varname); - tmp_name = NULL; } else { if (opline->op1_type == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) { varname = ZVAL_UNDEFINED_OP1(); @@ -1952,9 +1951,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_STATIC_PROP zend_std_unset_static_property(ce, name); - if (opline->op1_type != IS_CONST) { - zend_tmp_string_release(tmp_name); - } + zend_tmp_string_release(tmp_name); FREE_OP(free_op1); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } |