MESSENGER: Adjust asserts

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/src/service/messenger/messenger_api.c b/src/service/messenger/messenger_api.c
index dc2e6045a..ec5bc7f58 100644
--- a/src/service/messenger/messenger_api.c
+++ b/src/service/messenger/messenger_api.c
@@ -688,6 +688,8 @@ enqueue_message_to_room (struct GNUNET_MESSENGER_Room *room,
                          struct GNUNET_MESSENGER_Message *message,
                          struct GNUNET_MESSENGER_Message *transcript)
 {
+  GNUNET_assert((room) && (message));
+
   const struct GNUNET_CRYPTO_PrivateKey *key = get_handle_key (room->handle);
   enum GNUNET_GenericReturnValue priority;
 
diff --git a/src/service/messenger/messenger_api_queue_messages.c b/src/service/messenger/messenger_api_queue_messages.c
index 876bed939..bcf901f3c 100644
--- a/src/service/messenger/messenger_api_queue_messages.c
+++ b/src/service/messenger/messenger_api_queue_messages.c
@@ -70,7 +70,7 @@ enqueue_to_messages (struct GNUNET_MESSENGER_QueueMessages *messages,
                      struct GNUNET_MESSENGER_Message *transcript,
                      enum GNUNET_GenericReturnValue priority)
 {
-  GNUNET_assert ((messages) && (message));
+  GNUNET_assert ((messages) && (sender) && (message));
 
   struct GNUNET_MESSENGER_QueueMessage *element = GNUNET_new (struct
                                                               GNUNET_MESSENGER_QueueMessage);
@@ -81,8 +81,7 @@ enqueue_to_messages (struct GNUNET_MESSENGER_QueueMessages *messages,
   element->message = message;
   element->transcript = transcript;
 
-  if (sender)
-    GNUNET_memcpy (&(element->sender), sender, sizeof (element->sender));
+  GNUNET_memcpy (&(element->sender), sender, sizeof (element->sender));
 
   if (! element->message)
   {