diff options
| author | Denis Vlasenko | 2007-11-24 00:22:42 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-11-24 00:22:42 +0000 |
| commit | c3c6659f12e4133054ae4a6708fc4ac299c0d098 (patch) | |
| tree | 588de32513e22a75e8f45d450b9d25a965a2c444 | |
| parent | d2023283ac87737cf0fbd77f4cbb1bb7b390009d (diff) | |
| download | busybox-c3c6659f12e4133054ae4a6708fc4ac299c0d098.zip busybox-c3c6659f12e4133054ae4a6708fc4ac299c0d098.tar.gz | |
hush: fix segfault in "echo $@" when we have no arguments
| -rw-r--r-- | shell/hush.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/shell/hush.c b/shell/hush.c index b3c77aa..a9c1fe7 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -2468,7 +2468,7 @@ static void count_var_expansion_space(int *countp, int *lenp, char *arg) break; case '*': case '@': - for (i = 1; i < global_argc; i++) { + for (i = 1; global_argv[i]; i++) { len += strlen(global_argv[i]) + 1; count++; if (!(first_ch & 0x80)) @@ -2581,11 +2581,13 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg, char case '*': case '@': i = 1; + if (!global_argv[i]) + break; if (!(first_ch & 0x80)) { /* unquoted $* or $@ */ - while (i < global_argc) { + while (global_argv[i]) { n = expand_on_ifs(list, n, &pos, global_argv[i]); debug_printf_expand("expand_vars_to_list: argv %d (last %d)\n", i, global_argc-1); - if (global_argv[i++][0] && i < global_argc) { + if (global_argv[i++][0] && global_argv[i]) { /* this argv[] is not empty and not last: * put terminating NUL, start new word */ *pos++ = '\0'; @@ -2611,7 +2613,7 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg, char list[n++] = pos; } } else { /* quoted $*: add as one word */ - if (global_argv[i]) while (1) { + while (1) { strcpy(pos, global_argv[i]); pos += strlen(global_argv[i]); if (!global_argv[++i]) |