com php-src: Forbid writing to temporary expressions: Zend/tests/varSyntax/writeToTempExpr.phpt Zend/zend_compile .c Zend/zend_language_parser.y
| From: | Nikita Popov | Date: | Sat, 31 May 2014 17:41:39 +0000 |
| Subject: | com php-src: Forbid writing to temporary expressions: Zend/tests/varSyntax/writeToTempExpr.phpt Zend/zend_compile .c Zend/zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81068@lists.php.net to get a copy of this message | ||
Commit: 5c2120b6cf0d4a92a29dc7c38b407ee5ed213ddf
Author: Nikita Popov <nikic@php.net> Sat, 31 May 2014 19:41:39 +0200
Parents: 72b5e0cac00bac0b2253c4324d44eb4438a103de
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5c2120b6cf0d4a92a29dc7c38b407ee5ed213ddf
Log:
Forbid writing to temporary expressions
Changed paths:
A Zend/tests/varSyntax/writeToTempExpr.phpt
M Zend/zend_compile.c
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/tests/varSyntax/writeToTempExpr.phpt b/Zend/tests/varSyntax/writeToTempExpr.phpt
new file mode 100644
index 0000000..daeaf24
--- /dev/null
+++ b/Zend/tests/varSyntax/writeToTempExpr.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Writing to a temporary expression is not allowed
+--FILE--
+<?php
+
+[0, 1][0] = 1;
+
+?>
+--EXPECTF--
+Fatal error: Cannot use temporary expression in write context in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7040ed6..f5efd84 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1234,6 +1234,22 @@ void zend_do_begin_variable_parse(TSRMLS_D) /* {{{ */
}
/* }}} */
+static zend_bool zend_can_parse_variable_for_write(znode *variable TSRMLS_DC) /* {{{ */
+{
+ zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack));
+ zend_llist_element *le = fetch_list_ptr->head;
+ for (le = fetch_list_ptr->head; le; le = le->next) {
+ zend_op *opline = (zend_op *) le->data;
+ if ((opline->opcode != ZEND_SEPARATE && opline->opcode != ZEND_FETCH_W)
+ && (opline->op1_type == IS_TMP_VAR || opline->op1_type == IS_CONST)
+ ) {
+ return 0;
+ }
+ }
+ return 1;
+}
+/* }}} */
+
void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC) /* {{{ */
{
zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack));
@@ -1286,6 +1302,13 @@ void zend_do_end_variable_parse(znode *variable, int type, int arg_offset
TSRMLS
opline->op1_type = IS_CV;
opline->op1.var = CG(active_op_array)->this_var;
}
+ if (opline->opcode != ZEND_FETCH_W
+ && (opline->op1_type == IS_TMP_VAR || opline->op1_type == IS_CONST)
+ && (type != BP_VAR_R && type != BP_VAR_IS && type != BP_VAR_FUNC_ARG)
+ ) {
+ zend_error_noreturn(E_COMPILE_ERROR,
+ "Cannot use temporary expression in write context");
+ }
switch (type) {
case BP_VAR_R:
if (opline->opcode == ZEND_FETCH_DIM_W && opline->op2_type == IS_UNUSED) {
@@ -6373,18 +6396,19 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token,
zno
zend_bool is_variable;
zend_op dummy_opline;
+ open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
if (variable) {
- if (zend_is_function_or_method_call(array)) {
+ if (zend_is_function_or_method_call(array)
+ || !zend_can_parse_variable_for_write(array TSRMLS_CC)
+ ) {
is_variable = 0;
+ zend_do_end_variable_parse(array, BP_VAR_R, 0 TSRMLS_CC);
} else {
is_variable = 1;
+ zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC);
}
- /* save the location of FETCH_W instruction(s) */
- open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
- zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC);
} else {
is_variable = 0;
- open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
}
/* save the location of FE_RESET */
@@ -6464,19 +6488,21 @@ void zend_do_foreach_cont(znode *foreach_token, const znode
*open_brackets_token
CG(active_op_array)->opcodes[foreach_token->u.op.opline_num].extended_value |=
ZEND_FE_RESET_REFERENCE;
} else {
zend_op *fetch = &CG(active_op_array)->opcodes[foreach_token->u.op.opline_num];
- zend_op *end = &CG(active_op_array)->opcodes[open_brackets_token->u.op.opline_num];
-
- /* Change "write context" into "read context" */
- fetch->extended_value = 0; /* reset ZEND_FE_RESET_VARIABLE */
- while (fetch != end) {
- --fetch;
- if (fetch->opcode == ZEND_FETCH_DIM_W && fetch->op2_type == IS_UNUSED) {
- zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading");
- }
- if (fetch->opcode == ZEND_SEPARATE) {
- MAKE_NOP(fetch);
- } else {
- fetch->opcode -= 3; /* FETCH_W -> FETCH_R */
+ if (fetch->extended_value == ZEND_FE_RESET_VARIABLE) {
+ zend_op *end = &CG(active_op_array)->opcodes[open_brackets_token->u.op.opline_num];
+
+ /* Change "write context" into "read context" */
+ fetch->extended_value = 0; /* reset ZEND_FE_RESET_VARIABLE */
+ while (fetch != end) {
+ --fetch;
+ if (fetch->opcode == ZEND_FETCH_DIM_W && fetch->op2_type == IS_UNUSED) {
+ zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading");
+ }
+ if (fetch->opcode == ZEND_SEPARATE) {
+ MAKE_NOP(fetch);
+ } else {
+ fetch->opcode -= 3; /* FETCH_W -> FETCH_R */
+ }
}
}
}
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index d6b0f87..68ac2b7 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1064,8 +1064,8 @@ variable_class_name:
dereferencable:
variable { $$ = $1; }
- | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); }
- | dereferencable_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); }
+ | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); $$.EA = 0;
}
+ | dereferencable_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); $$.EA = 0; }
;
callable_expr: