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>
This commit is contained in:
@@ -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 } */
|
||||
|
||||
Reference in New Issue
Block a user