Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-13 06:54:44 +00:00
Code Issues Projects Releases Wiki Activity

hush: fix segfault in "echo $@" when we have no arguments

Browse Source
This commit is contained in:
Denis Vlasenko 2007-11-24 00:22:42 +00:00
parent d2023283ac
commit c3c6659f12
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shell/hush.c
View File

@ -2468,7 +2468,7 @@ static void count_var_expansion_space(int *countp, int *lenp, char *arg)
break; break;
case '*': case '*':
case '@': case '@':
for (i = 1; i < global_argc; i++) { for (i = 1; global_argv[i]; i++) {
len += strlen(global_argv[i]) + 1; len += strlen(global_argv[i]) + 1;
count++; count++;
if (!(first_ch & 0x80)) 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 '*':
case '@': case '@':
i = 1; i = 1;
if (!global_argv[i])
break;
if (!(first_ch & 0x80)) { /* unquoted $* or $@ */ if (!(first_ch & 0x80)) { /* unquoted $* or $@ */
while (i < global_argc) { while (global_argv[i]) {
n = expand_on_ifs(list, n, &pos, 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); 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: /* this argv[] is not empty and not last:
* put terminating NUL, start new word */ * put terminating NUL, start new word */
*pos++ = '\0'; *pos++ = '\0';
@ -2611,7 +2613,7 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg, char
list[n++] = pos; list[n++] = pos;
} }
} else { /* quoted $*: add as one word */ } else { /* quoted $*: add as one word */
if (global_argv[i]) while (1) { while (1) {
strcpy(pos, global_argv[i]); strcpy(pos, global_argv[i]);
pos += strlen(global_argv[i]); pos += strlen(global_argv[i]);
if (!global_argv[++i]) if (!global_argv[++i])