[PHP-CVS] com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y
Commit:ba568aaebb3f3c788a5551c016c0afafd7a5502e Author:Xinchen Hui larue...@php.net Thu, 26 Jul 2012 00:29:39 +0800 Parents: 0fbc8561e687689f796d95584cea1fa959eee83b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba568aaebb3f3c788a5551c016c0afafd7a5502e Log: 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; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y
test case? merge to other branches? Quoting Xinchen Hui larue...@php.net: Commit:ba568aaebb3f3c788a5551c016c0afafd7a5502e Author:Xinchen Hui larue...@php.net Thu, 26 Jul 2012 00:29:39 +0800 Parents: 0fbc8561e687689f796d95584cea1fa959eee83b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba568aaebb3f3c788a5551c016c0afafd7a5502e Log: 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; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y
On Wed, Jul 25, 2012 at 7:22 PM, Nuno Lopes nlop...@php.net wrote: test case? The test for this was already in the code base. It was just failing in some situations and was generating valgrind warnings when run with -m. merge to other branches? Constant dereferencing is only available on master, so it doesn't apply to other branches :) Nikita -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y
Quoting Nikita Popov nikita@gmail.com: On Wed, Jul 25, 2012 at 7:22 PM, Nuno Lopes nlop...@php.net wrote: test case? The test for this was already in the code base. It was just failing in some situations and was generating valgrind warnings when run with -m. merge to other branches? Constant dereferencing is only available on master, so it doesn't apply to other branches :) Ok! But, did we have a report about this on http://gcov.php.net ? Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y
On Wed, Jul 25, 2012 at 7:32 PM, Nuno Lopes nlop...@php.net wrote: Ok! But, did we have a report about this on http://gcov.php.net ? Yep, the valgrind report is also on gcov: http://gcov.php.net/viewer.php?version=PHP_HEADfunc=valgrindfile=Zend%2Ftests%2Fconst_dereference_002.phpt Nikita :) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed invalid read in CONST_STRING dereference, reported by Nikic: Zend/zend_language_parser.y
Quoting Nikita Popov nikita@gmail.com: On Wed, Jul 25, 2012 at 7:32 PM, Nuno Lopes nlop...@php.net wrote: Ok! But, did we have a report about this on http://gcov.php.net ? Yep, the valgrind report is also on gcov: http://gcov.php.net/viewer.php?version=PHP_HEADfunc=valgrindfile=Zend%2Ftests%2Fconst_dereference_002.phpt Nikita :) cool! Next time please provide more information on the commit message so that I don't have to bug you :) Thanks, Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php