kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25355 from neovim/backport-25354-to-release-0.9

Browse Source 
[Backport release-0.9] fix(api): handle NUL in nvim_err_write() and nvim_out_write()
This commit is contained in:
zeertzjq 2023-09-25 11:16:18 +08:00 committed by GitHub
commit e5ec72562d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/api/vim.c
View File

@ -1692,6 +1692,8 @@ static void write_msg(String message, bool to_err, bool writeln)
msg_didout = true; \
kv_drop(line_buf, kv_size(line_buf)); \
kv_resize(line_buf, LINE_BUFFER_MIN_SIZE); \
} else if (c == NUL) { \
kv_push(line_buf, NL); \
} else { \
kv_push(line_buf, c); \
}

50
test/functional/api/vim_spec.lua
View File

@ -1994,6 +1994,19 @@ describe('API', function()
end)
describe('nvim_out_write', function()
local screen
before_each(function()
screen = Screen.new(40, 8)
screen:attach()
screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue},
[1] = {bold = true, foreground = Screen.colors.SeaGreen},
[2] = {bold = true, reverse = true},
[3] = {foreground = Screen.colors.Blue},
})
end)
it('prints long messages correctly #20534', function()
exec([[
set more
@ -2014,14 +2027,7 @@ describe('API', function()
eq('\naaa\n' .. ('a'):rep(5002) .. '\naaa', meths.get_var('out'))
end)
it('blank line in message works', function()
local screen = Screen.new(40, 8)
screen:attach()
screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue},
[1] = {bold = true, foreground = Screen.colors.SeaGreen},
[2] = {bold = true, reverse = true},
})
it('blank line in message', function()
feed([[:call nvim_out_write("\na\n")<CR>]])
screen:expect{grid=[[
|
@ -2046,6 +2052,20 @@ describe('API', function()
{1:Press ENTER or type command to continue}^ |
]]}
end)
it('NUL bytes in message', function()
feed([[:lua vim.api.nvim_out_write('aaa\0bbb\0\0ccc\nddd\0\0\0eee\n')<CR>]])
screen:expect{grid=[[
|
{0:~ }|
{0:~ }|
{0:~ }|
{2: }|
aaa{3:^@}bbb{3:^@^@}ccc |
ddd{3:^@^@^@}eee |
{1:Press ENTER or type command to continue}^ |
]]}
end)
end)
describe('nvim_err_write', function()
@ -2134,6 +2154,20 @@ describe('API', function()
]])
feed('<cr>') -- exit the press ENTER screen
end)
it('NUL bytes in message', function()
nvim_async('err_write', 'aaa\0bbb\0\0ccc\nddd\0\0\0eee\n')
screen:expect{grid=[[
|
{0:~ }|
{0:~ }|
{0:~ }|
{3: }|
{1:aaa^@bbb^@^@ccc} |
{1:ddd^@^@^@eee} |
{2:Press ENTER or type command to continue}^ |
]]}
end)
end)
describe('nvim_err_writeln', function()