diff options
author | Daniel Bershatsky <daniel.bershatsky@skolkovotech.ru> | 2019-04-12 02:30:19 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2019-04-12 02:31:46 +0200 |
commit | 8dbf23181add0393556bdb3f4d026e46c7dcbf1e (patch) | |
tree | 1e90f9c9ae08f13688443cbbe22c6437fd716967 /src/nvim/msgpack_rpc/channel.c | |
parent | fd00806f01673891a4970851612dea1838a39fb9 (diff) | |
download | rneovim-8dbf23181add0393556bdb3f4d026e46c7dcbf1e.tar.gz rneovim-8dbf23181add0393556bdb3f4d026e46c7dcbf1e.tar.bz2 rneovim-8dbf23181add0393556bdb3f4d026e46c7dcbf1e.zip |
RPC: conform message-id type to msgpack-RPC spec
According to [MessagePack RPC specification](https://github.com/msgpack-rpc/msgpack-rpc),
message ID must be 32-bit unsigned integer. But Neovim implementation
uses uint64_t instead of uint32_t. This can have wrong results in the
case of large ids or a malformed request, for example:
Actual response: [1,18446744073709551615,[1,"Message is not an array"],null]
Expected response: [1,4294967295,[1,"Message is not an array"],null]
The issue does not affect RPC clients written in dynamically-typed
languages like Python. Wrong type of sequence id number breaks RPC
clients written statically typed languages like C/C++/Golang: all of
them expect uint32_t as message id.
Examples:
https://github.com/msgpack-rpc/msgpack-rpc-cpp/blob/11268ba2be5954ddbb2b7676c7da576985e45cfc/src/msgpack/rpc/protocol.h#L27
https://github.com/ugorji/go/blob/master/codec/msgpack.go#L993
closes #8850
Diffstat (limited to 'src/nvim/msgpack_rpc/channel.c')
-rw-r--r-- | src/nvim/msgpack_rpc/channel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index b64c5ca400..4cde9d22a1 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -131,7 +131,7 @@ Object rpc_send_call(uint64_t id, channel_incref(channel); RpcState *rpc = &channel->rpc; - uint64_t request_id = rpc->next_request_id++; + uint32_t request_id = rpc->next_request_id++; // Send the msgpack-rpc request send_request(channel, request_id, method_name, args); @@ -292,7 +292,7 @@ static void parse_msgpack(Channel *channel) static void handle_request(Channel *channel, msgpack_object *request) FUNC_ATTR_NONNULL_ALL { - uint64_t request_id; + uint32_t request_id; Error error = ERROR_INIT; MessageType type = msgpack_rpc_validate(&request_id, request, &error); @@ -437,7 +437,7 @@ static void internal_read_event(void **argv) wstream_release_wbuffer(buffer); } -static void send_error(Channel *chan, MessageType type, uint64_t id, char *err) +static void send_error(Channel *chan, MessageType type, uint32_t id, char *err) { Error e = ERROR_INIT; api_set_error(&e, kErrorTypeException, "%s", err); @@ -451,7 +451,7 @@ static void send_error(Channel *chan, MessageType type, uint64_t id, char *err) } static void send_request(Channel *channel, - uint64_t id, + uint32_t id, const char *name, Array args) { @@ -584,7 +584,7 @@ static bool is_rpc_response(msgpack_object *obj) static bool is_valid_rpc_response(msgpack_object *obj, Channel *channel) { - uint64_t response_id = obj->via.array.ptr[1].via.u64; + uint32_t response_id = (uint32_t)obj->via.array.ptr[1].via.u64; if (kv_size(channel->rpc.call_stack) == 0) { return false; } @@ -622,7 +622,7 @@ static void call_set_error(Channel *channel, char *msg, int loglevel) } static WBuffer *serialize_request(uint64_t channel_id, - uint64_t request_id, + uint32_t request_id, const String method, Array args, msgpack_sbuffer *sbuffer, @@ -643,7 +643,7 @@ static WBuffer *serialize_request(uint64_t channel_id, static WBuffer *serialize_response(uint64_t channel_id, MessageType type, - uint64_t response_id, + uint32_t response_id, Error *err, Object arg, msgpack_sbuffer *sbuffer) |