Re: com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y
| From: | Nuno Lopes | Date: | Wed, 25 Jul 2012 17:22:04 +0000 |
| Subject: | Re: com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-69700@lists.php.net to get a copy of this message | ||
test case?
merge to other branches?
Quoting Xinchen Hui <laruence@php.net>:
Commit: ba568aaebb3f3c788a5551c016c0afafd7a5502e Author: Xinchen Hui <laruence@php.net> Thu, 26 Jul 2012 00:29:39 +0800Parents: 0fbc8561e687689f796d95584cea1fa959eee83b Branches: masterLink: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba568aaebb3f3c788a5551c016c0afafd7a5502eLog: Fixed invalid read in CONST_STRING dereference, reported by Nikic Changed paths: M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e397fe1..c88e9a7 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; }