IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1847 from JackDanger/safely-freeing-channels

Browse Source 
Fix CID #102150
This commit is contained in:
Justin M. Keyes 2015-01-22 16:55:10 -08:00
commit 20fef8a7eb
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,17 +442,18 @@ static void handle_request(Channel *channel, msgpack_object *request)
if (error.set) {
// Validation failed, send response with error
channel_write(channel,
serialize_response(channel->id,
request_id,
&error,
NIL,
&out_buffer));
char buf[256];
snprintf(buf, sizeof(buf),
"Channel %" PRIu64 " sent an invalid message, closing.",
channel->id);
call_set_error(channel, buf);
if (channel_write(channel,
serialize_response(channel->id,
request_id,
&error,
NIL,
&out_buffer))) {
char buf[256];
snprintf(buf, sizeof(buf),
"Channel %" PRIu64 " sent an invalid message, closing.",
channel->id);
call_set_error(channel, buf);
}
return;
}
@ -619,8 +620,7 @@ static void unsubscribe(Channel *channel, char *event)
free(event_string);
}
/// Close the channel streams/job. The channel resources will be freed by
/// free_channel later.
/// Close the channel streams/job and free the channel resources.
static void close_channel(Channel *channel)
{
if (channel->closed) {