aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/msgpack_rpc/channel.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-11-07 13:44:36 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-11-07 13:44:49 -0300
commit847d5ffa7c21321765df1021465a20a96de8bfef (patch)
tree8fcf43d4559a0dff5e69598827d6d6a9de332853 /src/nvim/msgpack_rpc/channel.c
parent05ae9781b5d1dbff7bf82051e9ba6f8e3a68953b (diff)
parent4e880f3f0058dce4a2a8d6fafeee2d89fad291d3 (diff)
downloadrneovim-847d5ffa7c21321765df1021465a20a96de8bfef.tar.gz
rneovim-847d5ffa7c21321765df1021465a20a96de8bfef.tar.bz2
rneovim-847d5ffa7c21321765df1021465a20a96de8bfef.zip
Merge PR #1399 'Better handling for invalid msgpack-rpc'
Diffstat (limited to 'src/nvim/msgpack_rpc/channel.c')
-rw-r--r--src/nvim/msgpack_rpc/channel.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 5564bfa1be..aa6008558f 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -436,6 +436,11 @@ static void handle_request(Channel *channel, msgpack_object *request)
&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;
}
@@ -491,6 +496,10 @@ static bool channel_write(Channel *channel, WBuffer *buffer)
{
bool success;
+ if (channel->closed) {
+ return false;
+ }
+
if (channel->is_job) {
success = job_write(channel->data.job, buffer);
} else {