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 segfault when using the 'set' command with no arguments

Browse Source 
darcs-hash:20060502162830-ac50b-d3ab63c29a6daeaa62803923b060ec69942911f8.gz
This commit is contained in:
axel 2006-05-03 02:28:30 +10:00
parent d690a15b29
commit 92fde30c0c
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin_set.c
View File

@ -491,7 +491,7 @@ int builtin_set( wchar_t **argv )
al_push(&values, argv[woptind++]); al_push(&values, argv[woptind++]);
} }
if( is_path_variable( dest ) ) if( dest && is_path_variable( dest ) )
{ {
int i; int i;
int error = 0; int error = 0;

6
common.c
View File

@ -496,6 +496,12 @@ int contains_str( const wchar_t *a, ... )
va_list va; va_list va;
int res = 0; int res = 0;
if( !a )
{
debug( 1, L"Warning: Called contains_str with null argument. This is a bug." );
return 0;
}
va_start( va, a ); va_start( va, a );
while( (arg=va_arg(va, wchar_t *) )!= 0 ) while( (arg=va_arg(va, wchar_t *) )!= 0 )
{ {

4
common.h
View File

@ -181,9 +181,11 @@ void error_reset();
const wchar_t *wsetlocale( int category, const wchar_t *locale ); const wchar_t *wsetlocale( int category, const wchar_t *locale );
/** /**
Checks if \c needle is included in the list of strings specified Checks if \c needle is included in the list of strings specified. A warning is printed if needle is zero.
\param needle the string to search for in the list \param needle the string to search for in the list
\return zero is needle is not found, of if needle is null, non-zero otherwise
*/ */
int contains_str( const wchar_t *needle, ... ); int contains_str( const wchar_t *needle, ... );

2
fallback.h
View File

@ -6,7 +6,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <wctype.h> #include <wctype.h>
#include <wchar.h> #include <wchar.h>
#include "common.h"
/** /**
Under curses, tputs expects an int (*func)(char) as its last Under curses, tputs expects an int (*func)(char) as its last