diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 2eac6e1..bee8192 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -12751,7 +12751,7 @@ parsesub: { do { STPUTC(c, out); c = pgetc_eatbnl(); - } while ((subtype == 0 || subtype == VSLENGTH) && isdigit(c)); + } while (!subtype && isdigit(c)); } else if (c != '}') { /* $[{[#]]<specialchar>[}] */ int cc = c; @@ -12781,6 +12781,11 @@ parsesub: { } else goto badsub; + if (c != '}' && subtype == VSLENGTH) { + /* ${#VAR didn't end with } */ + goto badsub; + } + if (subtype == 0) { static const char types[] ALIGN1 = "}-+?="; /* ${VAR...} but not $VAR or ${#VAR} */ @@ -12837,8 +12842,6 @@ parsesub: { #endif } } else { - if (subtype == VSLENGTH && c != '}') - subtype = 0; badsub: pungetc(); } |