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

Add input checks to string_buffer_t functions

Browse source 
darcs-hash:20060121211629-ac50b-ce18cd1f58cf962d21e553fa292576ea7b3382ed.gz
This commit is contained in:
axel 2006-01-22 07:16:29 +10:00
parent 74fb5bd5e5
commit a824646d61
1 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
util.c
View file

@ -836,6 +836,12 @@ int wcsfilecmp( const wchar_t *a, const wchar_t *b )
void sb_init( string_buffer_t * b) void sb_init( string_buffer_t * b)
{ {
wchar_t c=0; wchar_t c=0;
if( !b )
{
return;
}
memset( b, 0, sizeof(string_buffer_t) ); memset( b, 0, sizeof(string_buffer_t) );
b_append( b, &c, sizeof( wchar_t)); b_append( b, &c, sizeof( wchar_t));
b->used -= sizeof(wchar_t); b->used -= sizeof(wchar_t);
@ -856,8 +862,14 @@ void sb_append( string_buffer_t *b, const wchar_t * s)
// fwprintf( stderr, L"Append string \'%ls\'\n", s ); // fwprintf( stderr, L"Append string \'%ls\'\n", s );
if( !s ) if( !s )
{
return; return;
}
if( !b )
{
return;
}
b_append( b, s, sizeof(wchar_t)*(wcslen(s)+1) ); b_append( b, s, sizeof(wchar_t)*(wcslen(s)+1) );
b->used -= sizeof(wchar_t); b->used -= sizeof(wchar_t);
@ -868,7 +880,14 @@ void sb_append_substring( string_buffer_t *b, const wchar_t *s, size_t l )
wchar_t tmp=0; wchar_t tmp=0;
if( !s ) if( !s )
{
return; return;
}
if( !b )
{
return;
}
b_append( b, s, sizeof(wchar_t)*l ); b_append( b, s, sizeof(wchar_t)*l );
b_append( b, &tmp, sizeof(wchar_t) ); b_append( b, &tmp, sizeof(wchar_t) );
@ -883,6 +902,12 @@ void sb_append_char( string_buffer_t *b, wchar_t c )
c, 0 c, 0
} }
; ;
if( !b )
{
return;
}
sb_append( b, buff ); sb_append( b, buff );
} }
@ -892,6 +917,11 @@ void sb_append2( string_buffer_t *b, ... )
va_list va; va_list va;
wchar_t *arg; wchar_t *arg;
if( !b )
{
return;
}
va_start( va, b ); va_start( va, b );
while( (arg=va_arg(va, wchar_t *) )!= 0 ) while( (arg=va_arg(va, wchar_t *) )!= 0 )
{ {
@ -905,6 +935,11 @@ int sb_printf( string_buffer_t *buffer, const wchar_t *format, ... )
va_list va; va_list va;
int res; int res;
if( !buffer )
{
return -1;
}
va_start( va, format ); va_start( va, format );
res = sb_vprintf( buffer, format, va ); res = sb_vprintf( buffer, format, va );
va_end( va ); va_end( va );
@ -916,6 +951,11 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig
{ {
int res; int res;
if( !buffer )
{
return -1;
}
if( !buffer->length ) if( !buffer->length )
{ {
buffer->length = MIN_SIZE; buffer->length = MIN_SIZE;
@ -972,6 +1012,11 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig
void sb_destroy( string_buffer_t * b ) void sb_destroy( string_buffer_t * b )
{ {
if( !b )
{
return;
}
free( b->buff ); free( b->buff );
} }