fixes

[oweals/gnunet.git] / src / util / client.c

diff --git a/src/util/client.c b/src/util/client.c
index 9dd70f26606cbafb3d38df7baee59feb9723c417..02de2ec636d2ad70464372f27cedb2c509047213 100644 (file)
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -202,8 +202,8 @@ check_complete (struct GNUNET_CLIENT_Connection *conn)
 {
   if ((conn->received_pos >= sizeof (struct GNUNET_MessageHeader)) &&
       (conn->received_pos >=
-       ntohs (((const struct GNUNET_MessageHeader *) conn->received_buf)->
-              size)))
+       ntohs (((const struct GNUNET_MessageHeader *) conn->
+               received_buf)->size)))
     conn->msg_complete = GNUNET_YES;
 }
 
@@ -287,16 +287,22 @@ receive_task (void *scls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   cmsg = (const struct GNUNET_MessageHeader *) sock->received_buf;
   msize = ntohs (cmsg->size);
   GNUNET_assert (sock->received_pos >= msize);
-  msg = GNUNET_malloc (msize);
-  memcpy (msg, cmsg, msize);
-  memmove (sock->received_buf,
-           &sock->received_buf[msize], sock->received_pos - msize);
+  if (handler != NULL)
+    {
+      msg = GNUNET_malloc (msize);
+      memcpy (msg, cmsg, msize);
+      memmove (sock->received_buf,
+              &sock->received_buf[msize], sock->received_pos - msize);
+    }
   sock->received_pos -= msize;
   sock->msg_complete = GNUNET_NO;
   sock->receiver_handler = NULL;
   check_complete (sock);
-  handler (cls, msg);
-  GNUNET_free (msg);
+  if (handler != NULL)
+    {
+      handler (cls, msg);
+      GNUNET_free (msg);
+    }
 }