summaryrefslogtreecommitdiff
path: root/Zend/zend_vm_def.h
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-08-10 10:08:31 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-08-10 10:11:56 +0200
commit2d087210ebb8adc06dcaca37b9d2dcb93ea2156c (patch)
tree5ad469d9a3774af6260e0d0dd6d9a6907a603ebb /Zend/zend_vm_def.h
parentfa9bd812fcab6dfd6d9b506cb3cb04dfa75d239d (diff)
downloadphp-git-2d087210ebb8adc06dcaca37b9d2dcb93ea2156c.tar.gz
Fixed bug #79947
Move the FREE_OP for op_data out of the zend_binary_assign_op_dim_slow() slow path, so it can be used by the other error path as well. This makes ASSIGN_DIM_OP structurally more similar to ASSIGN_DIM.
Diffstat (limited to 'Zend/zend_vm_def.h')
-rw-r--r--Zend/zend_vm_def.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 827548504c..a5a2070b43 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1272,6 +1272,7 @@ ZEND_VM_C_LABEL(assign_dim_op_new_array):
} else {
zend_binary_assign_op_dim_slow(container, dim OPLINE_CC EXECUTE_DATA_CC);
ZEND_VM_C_LABEL(assign_dim_op_ret_null):
+ FREE_UNFETCHED_OP_DATA();
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
ZVAL_NULL(EX_VAR(opline->result.var));
}