From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 5 Aug 2018 13:58:13 +0000 (+0200)
Subject: ash: parser: Fix parsing of ${}
X-Git-Tag: 1_30_0~467
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=58eb805c2c453c6764acbd65f5604465438d9272;p=oweals%2Fbusybox.git

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>
---

diff --git a/shell/ash.c b/shell/ash.c
index f74bef6b1..b596833e7 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 } */