diff options
Diffstat (limited to 'Zend/zend_vm_def.h')
| -rw-r--r-- | Zend/zend_vm_def.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 349c390764..aad472f6f2 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1631,8 +1631,8 @@ ZEND_VM_HELPER(zend_fetch_var_address_helper, CONST|TMPVAR|CV, UNUSED, int type) if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) { ZVAL_UNDEFINED_OP1(); } - name = zval_get_tmp_string(varname, &tmp_name); - if (UNEXPECTED(EG(exception))) { + name = zval_try_get_tmp_string(varname, &tmp_name); + if (UNEXPECTED(!name)) { FREE_OP1(); ZVAL_UNDEF(EX_VAR(opline->result.var)); HANDLE_EXCEPTION(); @@ -5896,8 +5896,8 @@ ZEND_VM_HANDLER(74, ZEND_UNSET_VAR, CONST|TMPVAR|CV, UNUSED, VAR_FETCH) if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) { varname = ZVAL_UNDEFINED_OP1(); } - name = zval_get_tmp_string(varname, &tmp_name); - if (UNEXPECTED(EG(exception))) { + name = zval_try_get_tmp_string(varname, &tmp_name); + if (UNEXPECTED(!name)) { FREE_OP1(); HANDLE_EXCEPTION(); } |