From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH v2: 48168: Fix handling of NUL bytes in zexpandtabs multibyte version
Date: Sat, 20 Mar 2021 16:15:51 +0100 [thread overview]
Message-ID: <20210320151551.29509-1-mikachu@gmail.com> (raw)
In-Reply-To: <485a976d-bcd6-4fcc-a4cc-c4e1831e9151@www.fastmail.com>
---
Src/utils.c | 5 ++++-
Test/B03print.ztst | 9 +++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Src/utils.c b/Src/utils.c
index 8fcea5362a..f8cbe65ba5 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -5936,8 +5936,11 @@ zexpandtabs(const char *s, int len, int width, int startpos, FILE *fout,
memset(&mbs, 0, sizeof(mbs));
s++;
len--;
- } else if (ret == MB_INCOMPLETE) {
+ } else if (ret == MB_INCOMPLETE ||
/* incomplete at end --- assume likewise, best we've got */
+ ret == 0) {
+ /* NUL character returns 0, which would loop infinitely, so advance
+ * one byte in this case too */
s++;
len--;
} else {
diff --git a/Test/B03print.ztst b/Test/B03print.ztst
index 5634239346..d8618de7d4 100644
--- a/Test/B03print.ztst
+++ b/Test/B03print.ztst
@@ -304,15 +304,16 @@
foo=$'one\ttwo\tthree\tfour\n'
foo+=$'\tone\ttwo\tthree\tfour\n'
foo+=$'\t\tone\t\ttwo\t\tthree\t\tfour'
- print -x4 $foo
- print -X4 $foo
+ foo+='\0' # regression test for multibyte tab expand
+ print -x4 $foo | sed 's/\x00/nul/' # avoid raw nul byte in expected output below
+ print -X4 $foo | sed 's/\x00/nul/'
0:Tab expansion by print
>one two three four
> one two three four
-> one two three four
+> one two three fournul
>one two three four
> one two three four
-> one two three four
+> one two three fournul
unset foo
print -v foo once more
--
2.15.1
next prev parent reply other threads:[~2021-03-20 15:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 2:51 PATCH: " Mikael Magnusson
2021-03-12 3:17 ` Mikael Magnusson
2021-03-12 13:53 ` Daniel Shahaf
2021-03-20 1:22 ` Lawrence Velázquez
2021-03-20 15:15 ` Mikael Magnusson [this message]
2021-03-27 16:11 ` PATCH v2: 48168: " Lawrence Velázquez
2021-04-01 5:21 ` Jun T
2021-04-01 7:46 ` Mikael Magnusson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210320151551.29509-1-mikachu@gmail.com \
--to=mikachu@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).