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

hush: do not inadvertently parse $((1 + "22")) as ok.

Browse Source 
-20 bytes code size
This commit is contained in:
Denis Vlasenko 2009-04-02 16:55:38 +00:00
parent 2f1d394214
commit f328e00b10
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shell/hush.c
View File

@ -432,7 +432,7 @@ enum {
CHAR_ORDINARY = 0, CHAR_ORDINARY = 0,
CHAR_ORDINARY_IF_QUOTED = 1, /* example: *, # */ CHAR_ORDINARY_IF_QUOTED = 1, /* example: *, # */
CHAR_IFS = 2, /* treated as ordinary if quoted */ CHAR_IFS = 2, /* treated as ordinary if quoted */
CHAR_SPECIAL = 3, /* example: $ */ CHAR_SPECIAL = 3, /* \, $, ", maybe ` */
}; };
enum { enum {
@ -4160,17 +4160,7 @@ static int parse_stream_dquoted(o_string *dest, struct in_str *input, int dquote
} }
debug_printf_parse(": ch=%c (%d) m=%d quote=%d\n", debug_printf_parse(": ch=%c (%d) m=%d quote=%d\n",
ch, ch, m, dest->o_quote); ch, ch, m, dest->o_quote);
if (m != CHAR_SPECIAL) { /* Basically, checking every CHAR_SPECIAL char except '"' */
o_addQchr(dest, ch);
if ((dest->o_assignment == MAYBE_ASSIGNMENT
|| dest->o_assignment == WORD_IS_KEYWORD)
&& ch == '='
&& is_assignment(dest->data)
) {
dest->o_assignment = DEFINITELY_ASSIGNMENT;
}
goto again;
}
if (ch == '\\') { if (ch == '\\') {
if (next == EOF) { if (next == EOF) {
syntax("\\<eof>"); syntax("\\<eof>");
@ -4208,9 +4198,17 @@ static int parse_stream_dquoted(o_string *dest, struct in_str *input, int dquote
add_till_backquote(dest, input); add_till_backquote(dest, input);
o_addchr(dest, SPECIAL_VAR_SYMBOL); o_addchr(dest, SPECIAL_VAR_SYMBOL);
//debug_printf_subst("SUBST RES3 '%s'\n", dest->data + pos); //debug_printf_subst("SUBST RES3 '%s'\n", dest->data + pos);
/* fall through */ goto again;
} }
#endif #endif
o_addQchr(dest, ch);
if (ch == '='
&& (dest->o_assignment == MAYBE_ASSIGNMENT
|| dest->o_assignment == WORD_IS_KEYWORD)
&& is_assignment(dest->data)
) {
dest->o_assignment = DEFINITELY_ASSIGNMENT;
}
goto again; goto again;
} }