zsh-workers
 help / color / mirror / code / Atom feed
* PATCH: Fix handling of NUL bytes in zexpandtabs multibyte version
@ 2021-03-12  2:51 Mikael Magnusson
  2021-03-12  3:17 ` Mikael Magnusson
  0 siblings, 1 reply; 8+ messages in thread
From: Mikael Magnusson @ 2021-03-12  2:51 UTC (permalink / raw)
  To: zsh-workers

Problem found by dg1727 on #zsh.

---

I checked other uses of zexpandtabs in the same file only and they all
seem to handle the 0 return correctly, and some of them even comment on
it, so fairly confident this is the right fix.

---
 Src/utils.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 {
-- 
2.15.1



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-04-01  7:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-12  2:51 PATCH: Fix handling of NUL bytes in zexpandtabs multibyte version 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     ` PATCH v2: 48168: " Mikael Magnusson
2021-03-27 16:11       ` Lawrence Velázquez
2021-04-01  5:21         ` Jun T
2021-04-01  7:46           ` Mikael Magnusson

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).