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

Merge pull request #16414 from zeertzjq/terminal-no-invalid-rows

Browse Source 
fix(terminal): return early if there are no invalid rows
This commit is contained in:
James McCoy 2021-12-09 21:13:16 -05:00 committed by GitHub
commit b20871526e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/terminal.c
View File

@ -1507,6 +1507,13 @@ static void refresh_screen(Terminal *term, buf_T *buf)
// Terminal height may have decreased before `invalid_end` reflects it. // Terminal height may have decreased before `invalid_end` reflects it.
term->invalid_end = MIN(term->invalid_end, height); term->invalid_end = MIN(term->invalid_end, height);
// There are no invalid rows.
if (term->invalid_start >= term->invalid_end) {
term->invalid_start = INT_MAX;
term->invalid_end = -1;
return;
}
for (int r = term->invalid_start, linenr = row_to_linenr(term, r); for (int r = term->invalid_start, linenr = row_to_linenr(term, r);
r < term->invalid_end; r++, linenr++) { r < term->invalid_end; r++, linenr++) {
fetch_row(term, r, width); fetch_row(term, r, width);

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

@ -6,9 +6,11 @@ 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 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
local matches = helpers.matches local matches = helpers.matches
local exec_lua = helpers.exec_lua
local sleep = helpers.sleep
describe(':terminal buffer', function() describe(':terminal buffer', function()
local screen local screen
@ -328,3 +330,37 @@ describe('No heap-buffer-overflow when', function()
assert_alive() assert_alive()
end) end)
end) end)
describe('on_lines does not emit out-of-bounds line indexes when', function()
before_each(function()
clear()
exec_lua([[
function _G.register_callback(bufnr)
_G.cb_error = ''
vim.api.nvim_buf_attach(bufnr, false, {
on_lines = function(_, bufnr, _, firstline, _, _)
local status, msg = pcall(vim.api.nvim_buf_get_offset, bufnr, firstline)
if not status then
_G.cb_error = msg
end
end
})
end
]])
end)
it('creating a terminal buffer #16394', function()
feed_command([[autocmd TermOpen * ++once call v:lua.register_callback(expand("<abuf>"))]])
feed_command('terminal')
sleep(500)
eq('', exec_lua([[return _G.cb_error]]))
end)
it('deleting a terminal buffer #16394', function()
feed_command('terminal')
sleep(500)
feed_command('lua _G.register_callback(0)')
feed_command('bdelete!')
eq('', exec_lua([[return _G.cb_error]]))
end)
end)