com php-src: Fixed access on uninitialized data in Zend/tests/c losure_019.phpt: Zend/zend_vm_def.h Zend/ zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Tue, 10 Mar 2015 11:05:14 +0000 |
| Subject: | com php-src: Fixed access on uninitialized data in Zend/tests/c losure_019.phpt: Zend/zend_vm_def.h Zend/ zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85440@lists.php.net to get a copy of this message | ||
Commit: fad8fe94a88a81fe1308e9715f3a54fb3ae8dabd
Author: Dmitry Stogov <dmitry@zend.com> Tue, 10 Mar 2015 14:05:14 +0300
Parents: 4f51f40bf18a666e4fcb5da13f9db2c8d2478fe3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fad8fe94a88a81fe1308e9715f3a54fb3ae8dabd
Log:
Fixed access on uninitialized data in Zend/tests/closure_019.phpt
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 9958e18..d60cf6a 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3526,6 +3526,8 @@ ZEND_VM_HANDLER(116, ZEND_SEND_VAL_EX, CONST|TMP, ANY)
if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) {
zend_error(E_EXCEPTION | E_ERROR, "Cannot pass parameter %d by reference",
opline->op2.num);
FREE_UNFETCHED_OP1();
+ arg = ZEND_CALL_VAR(EX(call), opline->result.var);
+ ZVAL_UNDEF(arg);
HANDLE_EXCEPTION();
}
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3f2cb21..2ae3059 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2887,6 +2887,8 @@ static int ZEND_FASTCALL
ZEND_SEND_VAL_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLE
if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) {
zend_error(E_EXCEPTION | E_ERROR, "Cannot pass parameter %d by reference",
opline->op2.num);
+ arg = ZEND_CALL_VAR(EX(call), opline->result.var);
+ ZVAL_UNDEF(arg);
HANDLE_EXCEPTION();
}
value = EX_CONSTANT(opline->op1);
@@ -9360,6 +9362,8 @@ static int ZEND_FASTCALL
ZEND_SEND_VAL_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_
if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) {
zend_error(E_EXCEPTION | E_ERROR, "Cannot pass parameter %d by reference",
opline->op2.num);
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
+ arg = ZEND_CALL_VAR(EX(call), opline->result.var);
+ ZVAL_UNDEF(arg);
HANDLE_EXCEPTION();
}
value = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1);