Add NULL check to deserializer functions

splone · Mar 14, 2016 · eac72b8 · eac72b8
1 parent a45a580
commit eac72b8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/rpc/msgpack/message.c b/src/rpc/msgpack/message.c
@@ -103,11 +103,11 @@ int message_serialize_error_response(msgpack_packer *pk,
 int message_serialize_response(struct message_response *res,
     msgpack_packer *pk)
 {
-  msgpack_pack_array(pk, 4);
-
-  if (pack_uint8(pk, MESSAGE_TYPE_RESPONSE) == -1)
+  if (!pk || !res)
     return (-1);
 
+  msgpack_pack_array(pk, 4);
+  pack_uint8(pk, MESSAGE_TYPE_RESPONSE);
   pack_uint32(pk, res->msgid);
   pack_nil(pk);
 
@@ -121,11 +121,11 @@ int message_serialize_response(struct message_response *res,
 int message_serialize_request(struct message_request *req,
     msgpack_packer *pk)
 {
-  msgpack_pack_array(pk, 4);
-
-  if (pack_uint8(pk, MESSAGE_TYPE_REQUEST) == -1)
+  if (!pk || !req)
     return (-1);
 
+  msgpack_pack_array(pk, 4);
+  pack_uint8(pk, MESSAGE_TYPE_REQUEST);
   pack_uint32(pk, req->msgid);
 
   if (req->method.str == NULL || (pack_string(pk, req->method) == -1))

diff --git a/test/unit/message-serialize-request.c b/test/unit/message-serialize-request.c
@@ -70,5 +70,8 @@ void unit_message_serialize_request(UNUSED(void **state))
 
   free_params(request.params);
 
+  /* null check */
+  assert_int_not_equal(0, message_serialize_request(NULL, NULL));
+
   msgpack_sbuffer_destroy(&sbuf);
 }
diff --git a/test/unit/message-serialize-response.c b/test/unit/message-serialize-response.c
@@ -55,8 +55,11 @@ void unit_message_serialize_response(UNUSED(void **state))
   response.params = params;
   assert_int_not_equal(0, message_serialize_response(&response, &pk));
   msgpack_sbuffer_clear(&sbuf);
-  
+
   free_params(response.params);
 
+  /* null check */
+  assert_int_not_equal(0, message_serialize_response(NULL, NULL));
+
   msgpack_sbuffer_destroy(&sbuf);
 }