diff options
| author | Nikita Popov <nikic@php.net> | 2014-10-13 14:51:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-10-13 15:31:59 +0200 |
| commit | e62edf2e58c31349498b3dcedd44b64d8fb1837f (patch) | |
| tree | dc53ee154413e1ce9e98001800ef31df0a2a3e0d | |
| parent | 2622cfc2fbc1e088d83307d94c55b45acccfce53 (diff) | |
| download | php-git-e62edf2e58c31349498b3dcedd44b64d8fb1837f.tar.gz | |
Fix array/object cast of refcounted tmp var
| -rw-r--r-- | Zend/tests/double_array_cast.phpt | 18 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 1 |
3 files changed, 19 insertions, 2 deletions
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-- +<?php + +$array = [1, 2, $x = 3]; +var_dump((array) (array) $array); + +?> +--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(); } |