GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 09:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1260: Hang when filtering buffer with NUL bytes (#33192)

Browse Source 
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: vim/vim#17011

53fed23cb7
(cherry picked from commit 431c037709)
This commit is contained in:
zeertzjq
2025-03-30 21:41:05 +08:00
committed by github-actions[bot]
parent 7efb3ba6f7
commit 2084cda6f9
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/os/shell.c
View File

@ -1211,7 +1211,6 @@ static void read_input(StringBuilder *buf)
size_t lplen = (size_t)ml_get_len(lnum); size_t lplen = (size_t)ml_get_len(lnum);
while (true) { while (true) {
lplen -= written;
if (lplen == 0) { if (lplen == 0) {
len = 0; len = 0;
} else if (lp[written] == NL) { } else if (lp[written] == NL) {
@ -1220,11 +1219,11 @@ static void read_input(StringBuilder *buf)
kv_push(*buf, NUL); kv_push(*buf, NUL);
} else { } else {
char *s = vim_strchr(lp + written, NL); char *s = vim_strchr(lp + written, NL);
len = s == NULL ? lplen : (size_t)(s - (lp + written)); len = s == NULL ? lplen - written : (size_t)(s - (lp + written));
kv_concat_len(*buf, lp + written, len); kv_concat_len(*buf, lp + written, len);
} }
if (len == lplen) { if (len == lplen - written) {
// Finished a line, add a NL, unless this line should not have one. // Finished a line, add a NL, unless this line should not have one.
if (lnum != curbuf->b_op_end.lnum if (lnum != curbuf->b_op_end.lnum
|| (!curbuf->b_p_bin && curbuf->b_p_fixeol) || (!curbuf->b_p_bin && curbuf->b_p_fixeol)

14
test/old/testdir/test_shell.vim
View File

@ -281,4 +281,18 @@ func Test_shell_no_prevcmd()
call delete('Xtestdone') call delete('Xtestdone')
endfunc endfunc
func Test_shell_filter_buffer_with_nul_bytes()
CheckUnix
new
set noshelltemp
" \n is a NUL byte
let lines = ["aaa\nbbb\nccc\nddd\neee", "fff\nggg\nhhh\niii\njjj"]
call setline(1, lines)
%!cat
call assert_equal(lines, getline(1, '$'))
set shelltemp&
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab