emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: parser: Fix VSLENGTH parsing with trailing garbage

Browse Source 
Let's adopt Herbert Xu's patch, not waiting for it to reach dash git:
hush already has a similar fix.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-25 02:09:41 +02:00
parent ad57e4e4b2
commit 53a7a9cd8c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell/ash.c
View File

@ -12751,7 +12751,7 @@ parsesub: {
do { do {
STPUTC(c, out); STPUTC(c, out);
c = pgetc_eatbnl(); c = pgetc_eatbnl();
} while (!subtype && isdigit(c)); } while ((subtype == 0 || subtype == VSLENGTH) && isdigit(c));
} else if (c != '}') { } else if (c != '}') {
/* $[{[#]]<specialchar>[}] */ /* $[{[#]]<specialchar>[}] */
int cc = c; int cc = c;
@ -12781,11 +12781,6 @@ parsesub: {
} else } else
goto badsub; goto badsub;
if (c != '}' && subtype == VSLENGTH) {
/* ${#VAR didn't end with } */
goto badsub;
}
if (subtype == 0) { if (subtype == 0) {
static const char types[] ALIGN1 = "}-+?="; static const char types[] ALIGN1 = "}-+?=";
/* ${VAR...} but not $VAR or ${#VAR} */ /* ${VAR...} but not $VAR or ${#VAR} */
@ -12842,6 +12837,8 @@ parsesub: {
#endif #endif
} }
} else { } else {
if (subtype == VSLENGTH && c != '}')
subtype = 0;
badsub: badsub:
pungetc(); pungetc();
} }