mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-16 11:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16276 from zeertzjq/channel-closed-term-error

Browse Source 
Fixes and tests for sending to terminal channel whose terminal has been deleted
This commit is contained in:
Björn Linse
2021-11-11 10:57:16 +01:00
committed by GitHub
parent 0ecc58c277 8b5c32c8cd
commit 5d653a1344
3 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1006,7 +1006,6 @@ Integer nvim_open_term(Buffer buffer, DictionaryOf(LuaRef) opts, Error *err)
Terminal *term = terminal_open(buf, topts);
terminal_check_size(term);
chan->term = term;
channel_incref(chan);
return (Integer)chan->id;
}
@@ -1036,6 +1035,8 @@ static void term_close(void *data)
Channel *chan = data;
terminal_destroy(chan->term);
chan->term = NULL;
api_free_luaref(chan->stream.internal.cb);
chan->stream.internal.cb = LUA_NOREF;
channel_decref(chan);
}

6
src/nvim/channel.c
View File

@@ -535,7 +535,11 @@ size_t channel_send(uint64_t id, char *data, size_t len, bool data_owned, const
goto retfree;
}
if (chan->streamtype == kChannelStreamInternal && chan->term) {
if (chan->streamtype == kChannelStreamInternal) {
if (!chan->term) {
*error = _("Can't send data to closed stream");
goto retfree;
}
terminal_receive(chan->term, data, len);
written = len;
goto retfree;

49
test/functional/terminal/channel_spec.lua Normal file
View File

@@ -0,0 +1,49 @@
local helpers = require('test.functional.helpers')(after_each)
local clear = helpers.clear
local eq = helpers.eq
local command = helpers.command
local exc_exec = helpers.exc_exec
local feed = helpers.feed
local sleep = helpers.sleep
local poke_eventloop = helpers.poke_eventloop
describe('associated channel is closed and later freed for terminal', function()
before_each(clear)
it('opened by nvim_open_term() and deleted by :bdelete!', function()
command([[let id = nvim_open_term(0, {})]])
-- channel hasn't been freed yet
eq("Vim(call):Can't send data to closed stream", exc_exec([[bdelete! | call chansend(id, 'test')]]))
-- process free_channel_event
poke_eventloop()
-- channel has been freed
eq("Vim(call):E900: Invalid channel id", exc_exec([[call chansend(id, 'test')]]))
end)
it('opened by termopen(), exited, and deleted by pressing a key', function()
command([[let id = termopen('echo')]])
sleep(500)
-- process has exited
eq("Vim(call):Can't send data to closed stream", exc_exec([[call chansend(id, 'test')]]))
-- delete terminal
feed('i<CR>')
-- process term_delayed_free and free_channel_event
poke_eventloop()
-- channel has been freed
eq("Vim(call):E900: Invalid channel id", exc_exec([[call chansend(id, 'test')]]))
end)
-- This indirectly covers #16264
it('opened by termopen(), exited, and deleted by :bdelete', function()
command([[let id = termopen('echo')]])
sleep(500)
-- process has exited
eq("Vim(call):Can't send data to closed stream", exc_exec([[call chansend(id, 'test')]]))
-- channel hasn't been freed yet
eq("Vim(call):Can't send data to closed stream", exc_exec([[bdelete | call chansend(id, 'test')]]))
-- process term_delayed_free and free_channel_event
poke_eventloop()
-- channel has been freed
eq("Vim(call):E900: Invalid channel id", exc_exec([[call chansend(id, 'test')]]))
end)
end)