From: Xinchen Hui Date: Wed, 25 Jul 2012 16:29:39 +0000 (+0800) Subject: Fixed invalid read in CONST_STRING dereference, reported by Nikic X-Git-Tag: php-5.5.0alpha1~20^2~151 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba568aaebb3f3c788a5551c016c0afafd7a5502e;p=php Fixed invalid read in CONST_STRING dereference, reported by Nikic --- diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e397fe138b..c88e9a7c00 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -802,7 +802,7 @@ expr_without_variable: combined_scalar_offset: combined_scalar '[' dim_offset ']' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } | combined_scalar_offset '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } + | T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']' { $1.EA = 0; zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } combined_scalar: T_ARRAY '(' array_pair_list ')' { $$ = $3; }