diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-10-30 11:53:35 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-10-30 11:53:35 +0800 |
| commit | cbd6165076cbbf18e68a292f80c1d454fdbedc22 (patch) | |
| tree | 820aeb2bbc6067dac888bbd157119a6a23052428 | |
| parent | [PARSER] Simplify EOF/newline handling in list parser (diff) | |
| download | dash-cbd6165076cbbf18e68a292f80c1d454fdbedc22.tar.gz dash-cbd6165076cbbf18e68a292f80c1d454fdbedc22.zip | |
[PARSER] Catch variable length expansions on non-existant specials
Currently we only check special variable names that follow directly
after $ or ${. So errors such as ${#&} are not caught. This patch
fixes that by moving the is_special check to just before we print out
the special variable name.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/parser.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 8e0d276..6a64f74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-30 Herbert Xu <herbert@gondor.apana.org.au> + + * Catch variable length expansions on non-existant specials. + 2014-10-28 Herbert Xu <herbert@gondor.apana.org.au> * Removed unnecessary pungetc on EOF from parser. diff --git a/src/parser.c b/src/parser.c index 382ddf2..382658e 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1229,8 +1229,7 @@ varname: STPUTC(c, out); c = pgetc_eatbnl(); } while (is_digit(c)); - } - else if (is_special(c)) { + } else { int cc = c; c = pgetc_eatbnl(); @@ -1251,10 +1250,14 @@ varname: } } + if (!is_special(cc)) { + if (subtype == VSLENGTH) + subtype = 0; + goto badsub; + } + USTPUTC(cc, out); } - else - goto badsub; if (subtype == 0) { switch (c) { |