diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-26 00:29:39 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-26 00:29:39 +0800 |
| commit | ba568aaebb3f3c788a5551c016c0afafd7a5502e (patch) | |
| tree | 6a0e77481d50dd7cd740a52d1606ec2b32901110 /Zend/zend_language_parser.y | |
| parent | 0fbc8561e687689f796d95584cea1fa959eee83b (diff) | |
| download | php-git-ba568aaebb3f3c788a5551c016c0afafd7a5502e.tar.gz | |
Fixed invalid read in CONST_STRING dereference, reported by Nikic
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |