aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-11-29 09:40:53 -0500
committerGitHub <noreply@github.com>2016-11-29 09:40:53 -0500
commit3979c6cbed6399934a06da35881e4d351c588af0 (patch)
tree218970a6c0c77b72f15ccc88cd2f7072ed2a9c94 /src
parent9e56278d0b2882657dc6614197e1cf6aad7bc08f (diff)
parentb37d0624590feab84dada09526e041471b092acb (diff)
downloadrneovim-3979c6cbed6399934a06da35881e4d351c588af0.tar.gz
rneovim-3979c6cbed6399934a06da35881e4d351c588af0.tar.bz2
rneovim-3979c6cbed6399934a06da35881e4d351c588af0.zip
Merge pull request #5687 from jamessan/if_py-crash
msgpack_rpc: Allocate empty string in msgpack_rpc_to_object
Diffstat (limited to 'src')
-rw-r--r--src/nvim/msgpack_rpc/helpers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index b0cfe2d6cd..5137b375f0 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -125,7 +125,7 @@ bool msgpack_rpc_to_object(const msgpack_object *const obj, Object *const arg)
dest = conv(((String) { \
.size = obj->via.attr.size, \
.data = (obj->via.attr.ptr == NULL || obj->via.attr.size == 0 \
- ? NULL \
+ ? xmemdupz("", 0) \
: xmemdupz(obj->via.attr.ptr, obj->via.attr.size)), \
})); \
break; \