mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 23:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: don't handle stale requests on already closed channel

Browse Source
This commit is contained in:
Björn Linse
2020-12-15 10:15:51 +01:00
parent d0668b36a3
commit 95352f490a
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/msgpack_rpc/channel.c
View File

@@ -377,6 +377,10 @@ static void request_event(void **argv)
Channel *channel = e->channel; Channel *channel = e->channel;
MsgpackRpcRequestHandler handler = e->handler; MsgpackRpcRequestHandler handler = e->handler;
Error error = ERROR_INIT; Error error = ERROR_INIT;
if (channel->rpc.closed) {
// channel was closed, abort any pending requests
goto free_ret;
}
Object result = handler.fn(channel->id, e->args, &error); Object result = handler.fn(channel->id, e->args, &error);
if (e->type == kMessageTypeRequest || ERROR_SET(&error)) { if (e->type == kMessageTypeRequest || ERROR_SET(&error)) {
// Send the response. // Send the response.
@@ -391,6 +395,8 @@ static void request_event(void **argv)
} else { } else {
api_free_object(result); api_free_object(result);
} }
free_ret:
api_free_array(e->args); api_free_array(e->args);
channel_decref(channel); channel_decref(channel);
xfree(e); xfree(e);

16
test/functional/api/server_notifications_spec.lua
View File

@@ -3,6 +3,8 @@ local eq, clear, eval, command, nvim, next_msg =
helpers.eq, helpers.clear, helpers.eval, helpers.command, helpers.nvim, helpers.eq, helpers.clear, helpers.eval, helpers.command, helpers.nvim,
helpers.next_msg helpers.next_msg
local meths = helpers.meths local meths = helpers.meths
local exec_lua = helpers.exec_lua
local retry = helpers.retry
describe('notify', function() describe('notify', function()
local channel local channel
@@ -72,4 +74,18 @@ describe('notify', function()
nvim('unsubscribe', 'event1') nvim('unsubscribe', 'event1')
eq(2, eval('1+1')) -- Still alive? eq(2, eval('1+1')) -- Still alive?
end) end)
it('cancels stale events on channel close', function()
if helpers.pending_win32(pending) then return end
local catchan = eval("jobstart(['cat'], {'rpc': v:true})")
eq({id=catchan, stream='job', mode='rpc', client = {}}, exec_lua ([[
vim.rpcnotify(..., "nvim_call_function", 'chanclose', {..., 'rpc'})
vim.rpcnotify(..., "nvim_subscribe", "daily_rant")
return vim.api.nvim_get_chan_info(...)
]], catchan))
eq(2, eval('1+1')) -- Still alive?
eq({false, 'Invalid channel: '..catchan},
exec_lua ([[ return {pcall(vim.rpcrequest, ..., 'nvim_eval', '1+1')}]], catchan))
retry(nil, 3000, function() eq({}, meths.get_chan_info(catchan)) end) -- cat be dead :(
end)
end) end)