github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 02:13:38 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix a crash in complete -C

Browse Source
This commit is contained in:
ridiculousfish 2012-02-26 13:46:21 -08:00
parent b30090f946
commit ad7c5886bc
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin_complete.cpp
View File

@ -296,7 +296,8 @@ static int builtin_complete( parser_t &parser, wchar_t **argv )
wcstring_list_t gnu_opt, old_opt; wcstring_list_t gnu_opt, old_opt;
const wchar_t *comp=L"", *desc=L"", *condition=L""; const wchar_t *comp=L"", *desc=L"", *condition=L"";
const wchar_t *do_complete = 0; bool do_complete = false;
wcstring do_complete_param;
wcstring_list_t cmd; wcstring_list_t cmd;
wcstring_list_t path; wcstring_list_t path;
@ -477,7 +478,8 @@ static int builtin_complete( parser_t &parser, wchar_t **argv )
break; break;
case 'C': case 'C':
do_complete = woptarg?woptarg:reader_get_buffer(); do_complete = true;
do_complete_param = woptarg ? woptarg : reader_get_buffer();
break; break;
case 'h': case 'h':
@ -535,19 +537,18 @@ static int builtin_complete( parser_t &parser, wchar_t **argv )
{ {
std::vector<completion_t> comp; std::vector<completion_t> comp;
const wchar_t *prev_temporary_buffer = temporary_buffer;
const wchar_t *token; const wchar_t *token;
parse_util_token_extent( do_complete, wcslen( do_complete ), &token, 0, 0, 0 ); parse_util_token_extent( do_complete_param.c_str(), do_complete_param.size(), &token, 0, 0, 0 );
temporary_buffer = do_complete; const wchar_t *prev_temporary_buffer = temporary_buffer;
temporary_buffer = do_complete_param.c_str();
if( recursion_level < 1 ) if( recursion_level < 1 )
{ {
recursion_level++; recursion_level++;
complete( do_complete, comp, COMPLETE_DEFAULT ); complete( do_complete_param, comp, COMPLETE_DEFAULT );
for( size_t i=0; i< comp.size() ; i++ ) for( size_t i=0; i< comp.size() ; i++ )
{ {

4
complete.cpp
View File

@ -1507,8 +1507,8 @@ bool completer_t::complete_variable(const wcstring &str, int start_offset)
*/ */
bool completer_t::try_complete_variable( const wcstring &str ) bool completer_t::try_complete_variable( const wcstring &str )
{ {
size_t i, len = str.size(); size_t i = str.size();
for( i=len-1; i>=0; i-- ) while (i--)
{ {
wchar_t c = str.at(i); wchar_t c = str.at(i);
if( c == L'$' ) if( c == L'$' )