diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-09 11:13:50 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-09 11:18:03 +0200 |
| commit | 04b17217b49d1e35765d47a29ccf1dd8ded57e63 (patch) | |
| tree | b2959a2ef99059b989225e2eb91a79d5715789a3 /Zend/zend_vm_def.h | |
| parent | fc7650944a0b4b37133c0082c598f7f89b3c4407 (diff) | |
| parent | 5795dfda93d1f60cce4731e2089ad5975a6c062f (diff) | |
| download | php-git-04b17217b49d1e35765d47a29ccf1dd8ded57e63.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #79599 in a different way
Revert "Fixed bug #97599 (coredump in set_error_handler)"
Diffstat (limited to 'Zend/zend_vm_def.h')
| -rw-r--r-- | Zend/zend_vm_def.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 1365958e5a..c891736870 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2523,7 +2523,6 @@ ZEND_VM_C_LABEL(try_assign_dim_array): } variable_ptr = zend_hash_next_index_insert(Z_ARRVAL_P(object_ptr), value); if (UNEXPECTED(variable_ptr == NULL)) { - FREE_OP_DATA(); zend_cannot_add_element(); ZEND_VM_C_GOTO(assign_dim_error); } else if (OP_DATA_TYPE == IS_CV) { @@ -2602,7 +2601,7 @@ ZEND_VM_C_LABEL(try_assign_dim_array): zend_use_scalar_as_array(); dim = GET_OP2_ZVAL_PTR(BP_VAR_R); ZEND_VM_C_LABEL(assign_dim_error): - FREE_UNFETCHED_OP_DATA(); + FREE_OP_DATA(); if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); } |