com php-src: Unified behavior of modification of returned by reference value in finnally code.: Zend/tests/bug72215_3. phpt Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Commit: e6f04d4c8e9adf24ecb9c8d5d2aaf33d311d64be Author: Dmitry Stogov <dmitry@zend.com> Wed, 13 Jul 2016 20:35:53 +0300 Parents: 02dca0cf160e239a5797176bd0eacf600c6667bf Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6f04d4c8e9adf24ecb9c8d5d2aaf33d311d64be Log: Unified behavior of modification of returned by reference value in finnally code. Changed paths: M Zend/tests/bug72215_3.phpt M Zend/zend_vm_def.h M Zend/zend_vm_execute..h Diff: diff --git a/Zend/tests/bug72215_3.phpt b/Zend/tests/bug72215_3.phpt index 38c017b..6f10fd7 100644 --- a/Zend/tests/bug72215_3.phpt +++ b/Zend/tests/bug72215_3.phpt @@ -4,7 +4,7 @@ Bug #72215.3 (Wrong return value if var modified in finally) <?php function &test() { try { - return $a; + return $a; } finally { $a = 2; } @@ -12,5 +12,4 @@ function &test() { var_dump(test()); ?> --EXPECT-- -NULL - +int(2) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index d8e033f..ce3fbeb 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -8103,7 +8103,10 @@ ZEND_VM_HANDLER(51, ZEND_MAKE_REF, VAR|CV, UNUSED) if (OP1_TYPE == IS_CV) { if (UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { - ZVAL_NULL(EX_VAR(opline->result.var)); + ZVAL_NEW_EMPTY_REF(op1); + Z_SET_REFCOUNT_P(op1, 2); + ZVAL_NULL(Z_REFVAL_P(op1)); + ZVAL_REF(EX_VAR(opline->result.var), Z_REF_P(op1)); } else { ZVAL_MAKE_REF(op1); ZVAL_COPY(EX_VAR(opline->result.var), op1); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7030499..ef73b19 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -21820,7 +21820,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_MAKE_REF_SPEC_VAR_UNUSED_HANDL if (IS_VAR == IS_CV) { if (UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { - ZVAL_NULL(EX_VAR(opline->result.var)); + ZVAL_NEW_EMPTY_REF(op1); + Z_SET_REFCOUNT_P(op1, 2); + ZVAL_NULL(Z_REFVAL_P(op1)); + ZVAL_REF(EX_VAR(opline->result.var), Z_REF_P(op1)); } else { ZVAL_MAKE_REF(op1); ZVAL_COPY(EX_VAR(opline->result.var), op1); @@ -42815,7 +42818,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_MAKE_REF_SPEC_CV_UNUSED_HANDLE if (IS_CV == IS_CV) { if (UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) { - ZVAL_NULL(EX_VAR(opline->result.var)); + ZVAL_NEW_EMPTY_REF(op1); + Z_SET_REFCOUNT_P(op1, 2); + ZVAL_NULL(Z_REFVAL_P(op1)); + ZVAL_REF(EX_VAR(opline->result.var), Z_REF_P(op1)); } else { ZVAL_MAKE_REF(op1); ZVAL_COPY(EX_VAR(opline->result.var), op1);