From e62edf2e58c31349498b3dcedd44b64d8fb1837f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 13 Oct 2014 14:51:53 +0200 Subject: [PATCH] Fix array/object cast of refcounted tmp var --- Zend/tests/double_array_cast.phpt | 18 ++++++++++++++++++ Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 1 - 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Zend/tests/double_array_cast.phpt diff --git a/Zend/tests/double_array_cast.phpt b/Zend/tests/double_array_cast.phpt new file mode 100644 index 0000000000..aaee8cd919 --- /dev/null +++ b/Zend/tests/double_array_cast.phpt @@ -0,0 +1,18 @@ +--TEST-- +Double array cast +--FILE-- + +--EXPECT-- +array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) +} diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 983029f359..a98e82d83a 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4043,7 +4043,7 @@ ZEND_VM_HANDLER(21, ZEND_CAST, CONST|TMP|VAR|CV, ANY) if (Z_OPT_REFCOUNTED_P(expr)) Z_ADDREF_P(expr); } - FREE_OP1(); + FREE_OP1_IF_VAR(); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index e18c7303be..2acd9f98c1 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9695,7 +9695,6 @@ static int ZEND_FASTCALL ZEND_CAST_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) if (Z_OPT_REFCOUNTED_P(expr)) Z_ADDREF_P(expr); } - zval_ptr_dtor_nogc(free_op1.var); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } -- 2.40.0