diff options
| author | Denys Vlasenko | 2018-08-05 15:58:13 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2018-08-05 18:11:15 +0200 |
| commit | 58eb805c2c453c6764acbd65f5604465438d9272 (patch) | |
| tree | 3095b6d1dc10310953ec48ffb5b964bf01319993 | |
| parent | 19358cc31317dca4642417066c1445ce00438e18 (diff) | |
| download | busybox-58eb805c2c453c6764acbd65f5604465438d9272.zip busybox-58eb805c2c453c6764acbd65f5604465438d9272.tar.gz | |
ash: parser: Fix parsing of ${}
Upstream commit:
Date: Tue, 3 Apr 2018 00:40:25 +0800
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>
function old new delta
readtoken1 2907 2916 +9
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/ash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index f74bef6..b596833 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -12431,7 +12431,7 @@ parsesub: { STPUTC(c, out); c = pgetc_eatbnl(); } while (isdigit(c)); - } else { + } else if (c != '}') { /* $[{[#]]<specialchar>[}] */ int cc = c; @@ -12457,7 +12457,8 @@ parsesub: { } USTPUTC(cc, out); - } + } else + goto badsub; if (c != '}' && subtype == VSLENGTH) { /* ${#VAR didn't end with } */ |