com php-src: Fixed in-place modification of IS_CONST operan d: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Fri, 20 Mar 2015 21:22:25 +0000 |
| Subject: | com php-src: Fixed in-place modification of IS_CONST operan d: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85668@lists.php.net to get a copy of this message | ||
Commit: 1f408af03cf5dcfbcabebb20f162d2ed787b5579
Author: Dmitry Stogov <dmitry@zend.com> Sat, 21 Mar 2015 00:22:25 +0300
Parents: 3a886a0c90a44318a434b13700cda02d0e4a4ca0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f408af03cf5dcfbcabebb20f162d2ed787b5579
Log:
Fixed in-place modification of IS_CONST operand
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 c448c29..95408eb 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3602,6 +3602,11 @@ ZEND_VM_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV,
UNUSED)
retval_ptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
+ if (OP1_TYPE == IS_CONST) {
+ ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
+ retval_ptr = EX_VAR(opline->result.var);
+ }
+
if (UNEXPECTED(!ret_info->class_name
&& ret_info->type_hint != IS_CALLABLE
&& !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(retval_ptr)))) {
@@ -3616,9 +3621,6 @@ ZEND_VM_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV, UNUSED)
}
}
zend_verify_return_type(EX(func), retval_ptr);
- if (OP1_TYPE == IS_CONST) {
- ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
- }
#endif
}
CHECK_EXCEPTION();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ea843fa..eb551ee 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -6970,6 +6970,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_
retval_ptr = EX_CONSTANT(opline->op1);
+ if (IS_CONST == IS_CONST) {
+ ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
+ retval_ptr = EX_VAR(opline->result.var);
+ }
+
if (UNEXPECTED(!ret_info->class_name
&& ret_info->type_hint != IS_CALLABLE
&& !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(retval_ptr)))) {
@@ -6984,9 +6989,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_
}
}
zend_verify_return_type(EX(func), retval_ptr);
- if (IS_CONST == IS_CONST) {
- ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
- }
#endif
}
CHECK_EXCEPTION();
@@ -11934,6 +11936,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UN
retval_ptr = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1);
+ if (IS_TMP_VAR == IS_CONST) {
+ ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
+ retval_ptr = EX_VAR(opline->result.var);
+ }
+
if (UNEXPECTED(!ret_info->class_name
&& ret_info->type_hint != IS_CALLABLE
&& !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(retval_ptr)))) {
@@ -11948,9 +11955,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UN
}
}
zend_verify_return_type(EX(func), retval_ptr);
- if (IS_TMP_VAR == IS_CONST) {
- ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
- }
#endif
}
CHECK_EXCEPTION();
@@ -17298,6 +17302,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UN
retval_ptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1);
+ if (IS_VAR == IS_CONST) {
+ ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
+ retval_ptr = EX_VAR(opline->result.var);
+ }
+
if (UNEXPECTED(!ret_info->class_name
&& ret_info->type_hint != IS_CALLABLE
&& !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(retval_ptr)))) {
@@ -17312,9 +17321,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UN
}
}
zend_verify_return_type(EX(func), retval_ptr);
- if (IS_VAR == IS_CONST) {
- ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
- }
#endif
}
CHECK_EXCEPTION();
@@ -22919,6 +22925,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED
retval_ptr = NULL;
+ if (IS_UNUSED == IS_CONST) {
+ ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
+ retval_ptr = EX_VAR(opline->result.var);
+ }
+
if (UNEXPECTED(!ret_info->class_name
&& ret_info->type_hint != IS_CALLABLE
&& !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(retval_ptr)))) {
@@ -22933,9 +22944,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED
}
}
zend_verify_return_type(EX(func), retval_ptr);
- if (IS_UNUSED == IS_CONST) {
- ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
- }
#endif
}
CHECK_EXCEPTION();
@@ -31864,6 +31872,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNU
retval_ptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var);
+ if (IS_CV == IS_CONST) {
+ ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
+ retval_ptr = EX_VAR(opline->result.var);
+ }
+
if (UNEXPECTED(!ret_info->class_name
&& ret_info->type_hint != IS_CALLABLE
&& !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(retval_ptr)))) {
@@ -31878,9 +31891,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNU
}
}
zend_verify_return_type(EX(func), retval_ptr);
- if (IS_CV == IS_CONST) {
- ZVAL_COPY(EX_VAR(opline->result.var), retval_ptr);
- }
#endif
}
CHECK_EXCEPTION();