Skip to content

Commit ba568aa

Browse files
committed
Fixed invalid read in CONST_STRING dereference, reported by Nikic
1 parent 0fbc856 commit ba568aa

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

Zend/zend_language_parser.y

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ expr_without_variable:
802802
combined_scalar_offset:
803803
combined_scalar '[' dim_offset ']' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); }
804804
| combined_scalar_offset '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); }
805-
| T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); }
805+
| T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']' { $1.EA = 0; zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); }
806806

807807
combined_scalar:
808808
T_ARRAY '(' array_pair_list ')' { $$ = $3; }

0 commit comments

Comments
 (0)