mirror of
https://github.com/neovim/neovim.git
synced 2024-09-17 20:58:20 -04:00
fix(rpc): fix hang with channel closed while waiting for response
This commit is contained in:
parent
d4e80a051e
commit
c422722b2e
@ -207,9 +207,15 @@ Object rpc_send_call(uint64_t id, const char *method_name, Array args, ArenaMem
|
||||
// Push the frame
|
||||
ChannelCallFrame frame = { request_id, false, false, NIL, NULL };
|
||||
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);
|
||||
|
||||
if (rpc->closed) {
|
||||
api_set_error(err, kErrorTypeException, "Invalid channel: %" PRIu64, id);
|
||||
channel_decref(channel);
|
||||
return NIL;
|
||||
}
|
||||
|
||||
if (frame.errored) {
|
||||
if (frame.result.type == kObjectTypeString) {
|
||||
api_set_error(err, kErrorTypeException, "%s",
|
||||
|
Loading…
Reference in New Issue
Block a user