diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-30 01:01:23 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-30 01:01:23 -0500 |
| commit | d8a2007d477cea2174e20b49342d5feb0bfdb7ce (patch) | |
| tree | 5bb8261a403fbd3da5564ff1a840b6752ee3cf7a /src/nvim/msgpack_rpc/helpers.c | |
| parent | 930ee40ad3c408c30d67147c9c3adaa635bb179f (diff) | |
| parent | 8373aaf44e6a64dda135a11f275f4616afa23b63 (diff) | |
| download | rneovim-d8a2007d477cea2174e20b49342d5feb0bfdb7ce.tar.gz rneovim-d8a2007d477cea2174e20b49342d5feb0bfdb7ce.tar.bz2 rneovim-d8a2007d477cea2174e20b49342d5feb0bfdb7ce.zip | |
Merge pull request #3869 from oni-link/fix.issue.3844
helpers.c: Handle msgpack str/bin objects with length 0 correctly
Diffstat (limited to 'src/nvim/msgpack_rpc/helpers.c')
| -rw-r--r-- | src/nvim/msgpack_rpc/helpers.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c index a119c4653a..5ef81721d4 100644 --- a/src/nvim/msgpack_rpc/helpers.c +++ b/src/nvim/msgpack_rpc/helpers.c @@ -94,10 +94,9 @@ bool msgpack_rpc_to_string(msgpack_object *obj, String *arg) FUNC_ATTR_NONNULL_ALL { if (obj->type == MSGPACK_OBJECT_BIN || obj->type == MSGPACK_OBJECT_STR) { - if (obj->via.bin.ptr == NULL) { - return false; - } - arg->data = xmemdupz(obj->via.bin.ptr, obj->via.bin.size); + arg->data = obj->via.bin.ptr != NULL + ? xmemdupz(obj->via.bin.ptr, obj->via.bin.size) + : NULL; arg->size = obj->via.bin.size; return true; } |