patch 9.1.1260: Hang when filtering buffer with NUL bytes
Problem: Hang when filtering buffer with NUL bytes (after 9.1.1050).
Solution: Don't subtract "written" from "lplen" repeatedly (zeertzjq).
related: neovim/neovim#33173
closes: #17011
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/os_unix.c b/src/os_unix.c
index 95b21d2..dc08408 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5260,14 +5260,13 @@
else if (wpid == 0) // child
{
linenr_T lnum = curbuf->b_op_start.lnum;
- int written = 0;
+ size_t written = 0;
char_u *lp = ml_get(lnum);
size_t lplen = (size_t)ml_get_len(lnum);
close(fromshell_fd);
for (;;)
{
- lplen -= written;
if (lplen == 0)
len = 0;
else if (lp[written] == NL)
@@ -5278,10 +5277,10 @@
char_u *s = vim_strchr(lp + written, NL);
len = write(toshell_fd, (char *)lp + written,
- s == NULL ? lplen
+ s == NULL ? lplen - written
: (size_t)(s - (lp + written)));
}
- if (len == (int)lplen)
+ if (len == (int)(lplen - written))
{
// Finished a line, add a NL, unless this line
// should not have one.
@@ -5305,7 +5304,7 @@
written = 0;
}
else if (len > 0)
- written += len;
+ written += (size_t)len;
}
_exit(0);
}