Merge pull request #3869 from oni-link/fix.issue.3844

helpers.c: Handle msgpack str/bin objects with length 0 correctly
This commit is contained in:
Justin M. Keyes
2015-12-30 01:01:23 -05:00
2 changed files with 23 additions and 4 deletions

View File

@@ -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;
}