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

Merge pull request #25144 from neovim/backport-24983-to-release-0.9

Browse Source 
[Backport release-0.9] fix(rpc): fix race condition
This commit is contained in:
zeertzjq
2023-09-14 09:34:53 +08:00
committed by GitHub
parent cd6536c140 9df72d3f9f
commit d1813f73b8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,9 +207,15 @@ Object rpc_send_call(uint64_t id, const char *method_name, Array args, ArenaMem
// Push the frame // Push the frame
ChannelCallFrame frame = { request_id, false, false, NIL, NULL }; ChannelCallFrame frame = { request_id, false, false, NIL, NULL };
kv_push(rpc->call_stack, &frame); kv_push(rpc->call_stack, &frame);
LOOP_PROCESS_EVENTS_UNTIL(&main_loop, channel->events, -1, frame.returned); LOOP_PROCESS_EVENTS_UNTIL(&main_loop, channel->events, -1, frame.returned || rpc->closed);
(void)kv_pop(rpc->call_stack); (void)kv_pop(rpc->call_stack);
if (rpc->closed) {
api_set_error(err, kErrorTypeException, "Invalid channel: %" PRIu64, id);
channel_decref(channel);
return NIL;
}
if (frame.errored) { if (frame.errored) {
if (frame.result.type == kObjectTypeString) { if (frame.result.type == kObjectTypeString) {
api_set_error(err, kErrorTypeException, "%s", api_set_error(err, kErrorTypeException, "%s",