Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix invalid free causing hangup and crash in completion code

Browse source 
darcs-hash:20051011194831-ac50b-d9d3a3ccf2c6723b1ca6ac952bc13d37c4759689.gz
This commit is contained in:
axel 2005-10-12 05:48:31 +10:00
parent 4ba35b8919
commit 93293b3557
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
complete.c
View file

@ -1977,7 +1977,7 @@ void complete( const wchar_t *cmd,
int old_error_max = error_max;
int done=0;
error_max=0;
/**
@ -1995,7 +1995,6 @@ void complete( const wchar_t *cmd,
done=1;
}
/*
Set on_command to true if cursor is over a command, and set the
name of the current command, and various other parsing to find
@ -2021,7 +2020,6 @@ void complete( const wchar_t *cmd,
done=1;
}
if( !done )
{
int had_cmd=0;
@ -2029,8 +2027,6 @@ void complete( const wchar_t *cmd,
tok_init( &tok, buff, TOK_ACCEPT_UNFINISHED );
free( buff );
while( !end_loop )
{
switch( tok_last_type( &tok ) )
@ -2053,7 +2049,7 @@ void complete( const wchar_t *cmd,
case TOK_BACKGROUND:
had_cmd=0;
break;
case TOK_ERROR:
end_loop=1;
@ -2068,7 +2064,7 @@ void complete( const wchar_t *cmd,
}
tok_destroy( &tok );
free( buff );
/*
Get the string to complete

12
reader.c
View file

@ -2389,7 +2389,7 @@ static int read_i()
wchar_t *reader_readline()
{
wchar_t c;
wint_t c;
int i;
int last_char=0, yank=0;
wchar_t *yank_str;
@ -2426,15 +2426,15 @@ wchar_t *reader_readline()
reader_save_status();
/*
Sometimes strange input sequences seem to generate a zero
byte. I believe these simply mean a character was pressed
but it should be ignored. (Example: Trying to add a tilde
(~) to digit)
Sometimes strange input sequences seem to generate a zero
byte. I believe these simply mean a character was pressed
but it should be ignored. (Example: Trying to add a tilde
(~) to digit)
*/
check_winch();
while( (c=input_readch()) == 0 )
;
check_winch();
reader_check_status();