mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-11 20:09:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): don't always leave if enter autocmds delete buffer #38324

Browse Source 
Problem: #38316 is a bit aggressive; we need not always leave Terminal mode if
autocmds put us in a different terminal.

Solution: don't skip entering; let terminal_check_focus handle whether we should
immediately leave.
This commit is contained in:
Sean Dewar
2026-03-16 09:56:36 +00:00
committed by GitHub
parent 5a0a26a725
commit 3cd07709ba
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/terminal.c
View File

@@ -951,13 +951,13 @@ bool terminal_enter(void)
may_trigger_modechanged(); may_trigger_modechanged();
s->term->refcount--; s->term->refcount--;
if (s->term->buf_handle == 0) { if (s->term->buf_handle == 0) {
s->close = true; // skip entering and close s->close = true;
} else {
s->state.execute = terminal_execute;
s->state.check = terminal_check;
state_enter(&s->state);
} }
s->state.execute = terminal_execute;
s->state.check = terminal_check;
state_enter(&s->state);
if (!s->got_bsl_o) { if (!s->got_bsl_o) {
restart_edit = 0; restart_edit = 0;
} }

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

@@ -1147,13 +1147,23 @@ describe(':terminal buffer', function()
end) end)
it('no heap-use-after-free from autocmds when entering terminal mode', function() it('no heap-use-after-free from autocmds when entering terminal mode', function()
local chans = api.nvim_list_chans()
local buf = api.nvim_get_current_buf() local buf = api.nvim_get_current_buf()
api.nvim_open_term(0, {}) local chan = api.nvim_open_term(0, {})
command('autocmd TermEnter,ModeChanged * ++once bwipeout!') command('autocmd TermEnter,ModeChanged * ++once bwipeout!')
feed('i') feed('i')
eq(false, api.nvim_buf_is_valid(buf)) eq(false, api.nvim_buf_is_valid(buf))
eq(chans, api.nvim_list_chans()) eq({}, api.nvim_get_chan_info(chan))
eq('n', fn.mode())
-- Remain in Terminal mode if autocmds put us in a different terminal.
buf = api.nvim_get_current_buf()
chan = api.nvim_open_term(0, {})
command('autocmd TermEnter,ModeChanged * ++once bwipeout! | let g:chan = nvim_open_term(0, {})')
feed('i')
eq(false, api.nvim_buf_is_valid(buf))
eq({}, api.nvim_get_chan_info(chan))
eq(api.nvim_get_current_buf(), api.nvim_get_chan_info(eval('g:chan')).buffer)
eq('t', fn.mode())
end) end)
local enew_screen = [[ local enew_screen = [[