diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/subst.c | 12 | ||||
| -rw-r--r-- | Test/D04parameter.ztst | 7 |
3 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2021-07-19 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + + * 49166: Src/subst.c, Test/D04parameter.ztst: fix coredump in + ${name:offset:length} with ill-formatted length + 2021-07-10 Oliver Kiddle <opk@zsh.org> * 49158: Completion/Debian/Command/_dscverify, diff --git a/Src/subst.c b/Src/subst.c index 87a56c3c6..465fe970f 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -3362,13 +3362,15 @@ colonsubscript: return NULL; } if (*check_offset2) { + char *nextp; check_offset = check_colon_subscript(check_offset2 + 1, - &check_offset2); - if (*check_offset2 && *check_offset2 != ':') { - zerr("invalid length: %s", check_offset); - return NULL; - } + &nextp); if (check_offset) { + check_offset2 = nextp; + if (*check_offset2 && *check_offset2 != ':') { + zerr("invalid length: %s", check_offset); + return NULL; + } length = mathevali(check_offset); length_set = 1; if (errflag) diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst index 05bb61bdc..b6b1f2e33 100644 --- a/Test/D04parameter.ztst +++ b/Test/D04parameter.ztst @@ -2664,10 +2664,9 @@ F:behavior, see http://austingroupbugs.net/view.php?id=888 >3: pw >4: pw - # Using a subshell because it segfaults. - ("${: :${{{\"{{lorem ipsum dolor sit amet}}") --f:regression test for workers/45843#1 -?(eval):1: bad substitution + : "${foo:0:${\"}}" +1:broken length in ${name:offset:length} (workers/45843#1) +?(eval):1: unrecognized modifier `$' $ZTST_testdir/../Src/zsh -fc $'$\\\n(' 1:regression test for workers/45843#2: escaped newline in command substitution start token |