mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-03 08:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): avoid reading over the end of cell.chars (#19580)

Browse Source
This commit is contained in:
zeertzjq
2022-07-30 21:40:30 +08:00
committed by GitHub
parent c34d72bf7c
commit d36d9be8ff
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/terminal.c
View File

@@ -1384,7 +1384,7 @@ static void fetch_row(Terminal *term, int row, int end_col)
fetch_cell(term, row, col, &cell); fetch_cell(term, row, col, &cell);
if (cell.chars[0]) { if (cell.chars[0]) {
int cell_len = 0; int cell_len = 0;
for (int i = 0; cell.chars[i]; i++) { for (int i = 0; i < VTERM_MAX_CHARS_PER_CELL && cell.chars[i]; i++) {
cell_len += utf_char2bytes((int)cell.chars[i], ptr + cell_len); cell_len += utf_char2bytes((int)cell.chars[i], ptr + cell_len);
} }
ptr += cell_len; ptr += cell_len;

10
test/functional/terminal/buffer_spec.lua
View File

@@ -5,6 +5,8 @@ local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
local poke_eventloop = helpers.poke_eventloop local poke_eventloop = helpers.poke_eventloop
local eval, feed_command, source = helpers.eval, helpers.feed_command, helpers.source local eval, feed_command, source = helpers.eval, helpers.feed_command, helpers.source
local eq, neq = helpers.eq, helpers.neq local eq, neq = helpers.eq, helpers.neq
local meths = helpers.meths
local retry = helpers.retry
local write_file = helpers.write_file local write_file = helpers.write_file
local command = helpers.command local command = helpers.command
local exc_exec = helpers.exc_exec local exc_exec = helpers.exc_exec
@@ -364,3 +366,11 @@ describe('on_lines does not emit out-of-bounds line indexes when', function()
eq('', exec_lua([[return _G.cb_error]])) eq('', exec_lua([[return _G.cb_error]]))
end) end)
end) end)
it('terminal truncates number of composing characters to 5', function()
clear()
local chan = meths.open_term(0, {})
local composing = ('a̳'):sub(2)
meths.chan_send(chan, 'a' .. composing:rep(8))
retry(nil, nil, function() eq('a' .. composing:rep(5), meths.get_current_line()) end)
end)