diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/subst.c | 19 |
2 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index afdf63882..fdbe1cbe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-05-15 Sven Wischnowsky <wischnow@zsh.org> + * 11380: Src/subst.c: detect additional characters in parameter + expansions and signal an error for them + * 11379: Completion/Base/.distfiles, Completion/Base/_in_vared, Completion/Core/_compalso, Completion/Core/_complete, Completion/Core/_main_complete, Doc/Zsh/compsys.yo: add _in_vared diff --git a/Src/subst.c b/Src/subst.c index 1dc952083..94a1222d8 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -1230,6 +1230,15 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) if (!inbrace) break; } + if (inbrace && + (c = *s) != '-' && c != '+' && c != ':' && c != '%' && c != '/' && + c != '=' && c != Equals && + c != '#' && c != Pound && + c != '?' && c != Quest && + c != '}' && c != Outbrace) { + zerr("bad substitution", NULL, 0); + return NULL; + } if (isarr) { if (nojoin) isarr = -1; @@ -1463,9 +1472,6 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) } } { - char t = s[-1]; - - singsub(&s); #if 0 /* * This allows # and % to be at the start of @@ -1473,6 +1479,11 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) * a bit nasty, and can be done (although * less efficiently) with anchors. */ + + char t = s[-1]; + + singsub(&s); + if (t == '/' && (flags & SUB_SUBSTR)) { if ((c = *s) == '#' || c == '%') { flags &= ~SUB_SUBSTR; @@ -1483,6 +1494,8 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) s++; } } +#else + singsub(&s); #endif } |