h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-01 13:01:21 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix two crash bugs in highlighter/parser for malformed lines (Thanks to Netocrat for the bug report)

Browse Source 
darcs-hash:20060703104647-ac50b-9eb649322611a3e7fd95ef5f80acdc25ce09d11a.gz
This commit is contained in:
axel
2006-07-03 20:46:47 +10:00
parent d56ab1d365
commit 7bb070d817
4 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
parse_util.c
View File

@@ -180,27 +180,27 @@ void parse_util_cmdsubst_extent( const wchar_t *buff,
{
wchar_t *begin, *end;
wchar_t *pos;
const wchar_t *cursor = buff + cursor_pos;
CHECK( buff, );
if( a )
*a=0;
*a = (wchar_t *)buff;
if( b )
*b = 0;
*b = (wchar_t *)buff+wcslen(buff);
pos = (wchar_t *)buff;
while( 1 )
{
int bc, ec;
if( parse_util_locate_cmdsubst( pos,
&begin,
&end,
1 ) <= 0)
{
begin=(wchar_t *)buff;
end = (wchar_t *)buff + wcslen(buff);
/*
No subshell found
*/
break;
}
@@ -209,12 +209,13 @@ void parse_util_cmdsubst_extent( const wchar_t *buff,
end = (wchar_t *)buff + wcslen(buff);
}
bc = begin-buff;
ec = end-buff;
if(( bc < cursor_pos ) && (ec >= cursor_pos) )
if(( begin < cursor ) && (end >= cursor) )
{
begin++;
if( a )
*a = begin;
if( b )
*b = end;
break;
}
@@ -225,10 +226,7 @@ void parse_util_cmdsubst_extent( const wchar_t *buff,
pos = end+1;
}
if( a )
*a = begin;
if( b )
*b = end;
}
/**
@@ -359,21 +357,21 @@ void parse_util_token_extent( const wchar_t *buff,
if( !end || !begin )
return;
pos = cursor_pos - (begin - buff);
a = (wchar_t *)buff + pos;
b = a;
pa = (wchar_t *)buff + pos;
pb = pa;
assert( begin >= buff );
assert( begin <= (buff+wcslen(buff) ) );
assert( end >= begin );
assert( end <= (buff+wcslen(buff) ) );
buffcpy = wcsndup( begin, end-begin );
if( !buffcpy )
{
DIE_MEM();