diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-04-03 00:40:25 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-04-19 18:19:29 +0800 |
| commit | 6348e861b20d0b90275970af7357ac35ef956f16 (patch) | |
| tree | 4f0d2e94ecf3ceecb14eba8a601fd4ffa8e00114 /src/parser.c | |
| parent | man: correct typos, iff -> if (diff) | |
| download | dash-6348e861b20d0b90275970af7357ac35ef956f16.tar.gz dash-6348e861b20d0b90275970af7357ac35ef956f16.zip | |
parser: Fix parsing of ${}
dash -c 'echo ${}' should print "Bad subtitution" but instead
fails with "Syntax error: Missing '}'". This is caused by us
reading an extra character beyond the right brace. This patch
fixes it so that this construct only fails during expansion rather
than during parsing.
Fixes: 3df3edd13389 ("[PARSER] Report substition errors at...")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
| -rw-r--r-- | src/parser.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/parser.c b/src/parser.c index 6a8a4a4..efa8060 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1262,7 +1262,7 @@ varname: STPUTC(c, out); c = pgetc_eatbnl(); } while (is_digit(c)); - } else { + } else if (c != '}') { int cc = c; c = pgetc_eatbnl(); @@ -1290,7 +1290,8 @@ varname: } USTPUTC(cc, out); - } + } else + goto badsub; if (subtype == 0) { int cc = c; |