Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 21:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor tweaks to expand_Variables, fixes rare memory leak

Browse source 
darcs-hash:20060207114857-ac50b-9b2ecf31106678ec35d888066162bf14605c6003.gz
This commit is contained in:
axel 2006-02-07 21:48:57 +10:00
parent c4dfdfa849
commit ddff3561e3
1 changed files with 68 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
expand.c
View file

@ -317,8 +317,8 @@ static int match_pid( const wchar_t *cmd,
return 0; return 0;
/* /*
Test if the commandline is a path to the command, if so we try Test if the commandline is a path to the command, if so we try
to match against only the command part to match against only the command part
*/ */
wchar_t *first_token = tok_first( cmd ); wchar_t *first_token = tok_first( cmd );
if( first_token == 0 ) if( first_token == 0 )
@ -329,8 +329,8 @@ static int match_pid( const wchar_t *cmd,
wchar_t *p; wchar_t *p;
/* /*
This should be done by basename(), if it wasn't for the fact This should be done by basename(), if it wasn't for the fact
that is does not accept wide strings that is does not accept wide strings
*/ */
for( p=first_token; *p; p++ ) for( p=first_token; *p; p++ )
{ {
@ -491,9 +491,9 @@ static int find_process( const wchar_t *proc,
if( flags & ACCEPT_INCOMPLETE ) if( flags & ACCEPT_INCOMPLETE )
{ {
wchar_t *res = wcsdupcat2( p->actual_cmd + wcslen(proc), wchar_t *res = wcsdupcat2( p->actual_cmd + wcslen(proc),
COMPLETE_SEP_STR, COMPLETE_SEP_STR,
COMPLETE_CHILD_PROCESS_DESC, COMPLETE_CHILD_PROCESS_DESC,
(void *)0); (void *)0);
al_push( out, res ); al_push( out, res );
} }
else else
@ -603,7 +603,7 @@ static int find_process( const wchar_t *proc,
if( flags & ACCEPT_INCOMPLETE ) if( flags & ACCEPT_INCOMPLETE )
{ {
wchar_t *res = wcsdupcat2( cmd + wcslen(proc), wchar_t *res = wcsdupcat2( cmd + wcslen(proc),
COMPLETE_SEP_STR, COMPLETE_SEP_STR,
COMPLETE_PROCESS_DESC, COMPLETE_PROCESS_DESC,
(void *)0); (void *)0);
if( res ) if( res )
@ -713,6 +713,17 @@ static int expand_pid( wchar_t *in,
/** /**
Expand all environment variables in the string *ptr. Expand all environment variables in the string *ptr.
This function is slow, fragile and complicated. There are lots of
little corner cases, like $$foo should do a double expansion,
$foo$bar should not double expand bar, etc. Also, it's easy to
accidentally leak memory on array out of bounds errors an various
other situations. All in all, this function should be rewritten,
split out into multiple logical units and carefully tested. After
that, it can probably be optimized to do fewer memory allocations,
fewer string scans and overall just less work. But until that
happens, don't edit it unless you know exactly what you are doing,
and do proper testing afterwards.
*/ */
static int expand_variables( wchar_t *in, array_list_t *out ) static int expand_variables( wchar_t *in, array_list_t *out )
{ {
@ -885,70 +896,71 @@ static int expand_variables( wchar_t *in, array_list_t *out )
free( var_val ); free( var_val );
} }
if( is_single ) if( is_ok )
{ {
string_buffer_t res;
sb_init( &res );
in[i]=0; if( is_single )
sb_append( &res, in );
sb_append_char( &res, INTERNAL_SEPARATOR );
for( j=0; j<al_get_count( &l); j++ )
{ {
wchar_t *next = (wchar_t *)al_get( &l, j ); string_buffer_t res;
sb_init( &res );
if( is_ok ) in[i]=0;
sb_append( &res, in );
sb_append_char( &res, INTERNAL_SEPARATOR );
for( j=0; j<al_get_count( &l); j++ )
{ {
if( j != 0 ) wchar_t *next = (wchar_t *)al_get( &l, j );
sb_append( &res, L" " );
sb_append( &res, next );
}
free( next );
}
sb_append( &res, &in[stop_pos] );
is_ok &= expand_variables( wcsdup((wchar_t *)res.buff), out );
sb_destroy( &res ); if( is_ok )
}
else
{
for( j=0; j<al_get_count( &l); j++ )
{
wchar_t *next = (wchar_t *)al_get( &l, j );
if( is_ok )
{
new_len = wcslen(in) - (stop_pos-start_pos+1) + wcslen( next) +2;
if( !(new_in = malloc( sizeof(wchar_t)*new_len )))
{ {
die_mem(); if( j != 0 )
sb_append( &res, L" " );
sb_append( &res, next );
} }
else free( next );
}
sb_append( &res, &in[stop_pos] );
is_ok &= expand_variables( (wchar_t *)res.buff, out );
}
else
{
for( j=0; j<al_get_count( &l); j++ )
{
wchar_t *next = (wchar_t *)al_get( &l, j );
if( is_ok )
{ {
wcsncpy( new_in, in, start_pos-1 ); new_len = wcslen(in) - (stop_pos-start_pos+1) + wcslen( next) +2;
if(start_pos>1 && new_in[start_pos-2]!=VARIABLE_EXPAND) if( !(new_in = malloc( sizeof(wchar_t)*new_len )))
{ {
new_in[start_pos-1]=INTERNAL_SEPARATOR; die_mem();
new_in[start_pos]=L'\0';
} }
else else
new_in[start_pos-1]=L'\0'; {
wcscat( new_in, next ); wcsncpy( new_in, in, start_pos-1 );
wcscat( new_in, &in[stop_pos] );
if(start_pos>1 && new_in[start_pos-2]!=VARIABLE_EXPAND)
{
new_in[start_pos-1]=INTERNAL_SEPARATOR;
new_in[start_pos]=L'\0';
}
else
new_in[start_pos-1]=L'\0';
wcscat( new_in, next );
wcscat( new_in, &in[stop_pos] );
// fwprintf( stderr, L"New value %ls\n", new_in ); // fwprintf( stderr, L"New value %ls\n", new_in );
is_ok &= expand_variables( new_in, out ); is_ok &= expand_variables( new_in, out );
}
} }
free( next );
} }
free( next );
} }
} }