emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not let handle_dollar() accept vars that start with a digit

Browse Source
This commit is contained in:
Mike Frysinger 2009-03-28 21:06:22 +00:00
parent 56bdea1b43
commit 7c3e52c1bd
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/hush.c
View File

@ -1647,6 +1647,7 @@ static int expand_vars_to_list(o_string *output, int n, char *arg, char or_mask)
/* lookup the variable in question */ /* lookup the variable in question */
if (isdigit(var[0])) { if (isdigit(var[0])) {
/* handle_dollar() should have vetted var for us */
i = xatoi_u(var); i = xatoi_u(var);
if (i < G.global_argc) if (i < G.global_argc)
val = G.global_argv[i]; val = G.global_argv[i];
@ -3726,22 +3727,33 @@ static int handle_dollar(o_string *dest, struct in_str *input)
case '@': /* args */ case '@': /* args */
goto make_one_char_var; goto make_one_char_var;
case '{': { case '{': {
bool first_char; bool first_char, all_digits;
o_addchr(dest, SPECIAL_VAR_SYMBOL); o_addchr(dest, SPECIAL_VAR_SYMBOL);
i_getch(input); i_getch(input);
/* XXX maybe someone will try to escape the '}' */ /* XXX maybe someone will try to escape the '}' */
expansion = 0; expansion = 0;
first_char = true; first_char = true;
all_digits = false;
while (1) { while (1) {
ch = i_getch(input); ch = i_getch(input);
if (ch == '}') if (ch == '}')
break; break;
if (ch == '#' && first_char) if (first_char) {
/* ${#var}: length of var contents */; if (ch == '#')
/* ${#var}: length of var contents */
goto char_ok;
else if (isdigit(ch)) {
all_digits = true;
goto char_ok;
}
}
else if (expansion < 2 && !isalnum(ch) && ch != '_') { if (expansion < 2 &&
((all_digits && !isdigit(ch)) ||
(!all_digits && !isalnum(ch) && ch != '_')))
{
/* handle parameter expansions /* handle parameter expansions
* http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02 * http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02
*/ */
@ -3782,6 +3794,8 @@ static int handle_dollar(o_string *dest, struct in_str *input)
return 1; return 1;
} }
} }
char_ok:
debug_printf_parse(": '%c'\n", ch); debug_printf_parse(": '%c'\n", ch);
o_addchr(dest, ch | quote_mask); o_addchr(dest, ch | quote_mask);
quote_mask = 0; quote_mask = 0;