bugfix

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

diff --git a/src/util/client.c b/src/util/client.c
index 9dd70f26606cbafb3d38df7baee59feb9723c417..f0322ffa5fae187562627abadc8991dcfde0a27a 100644 (file)
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -103,7 +103,7 @@ struct GNUNET_CLIENT_Connection
   /**
    * Size of received_buf.
    */
-  size_t received_size;
+  unsigned int received_size;
 
   /**
    * Do we have a complete response in received_buf?
@@ -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;
 }
 
@@ -276,27 +276,25 @@ static void
 receive_task (void *scls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_CLIENT_Connection *sock = scls;
-  const struct GNUNET_MessageHeader *cmsg;
-  struct GNUNET_MessageHeader *msg;
   GNUNET_CLIENT_MessageHandler handler = sock->receiver_handler;
+  const struct GNUNET_MessageHeader *cmsg = (const struct GNUNET_MessageHeader *) sock->received_buf;
   void *cls = sock->receiver_handler_cls;
-  uint16_t msize;
+  uint16_t msize = ntohs (cmsg->size);
+  char mbuf[msize];
+  struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader*) mbuf;
 
   GNUNET_assert (GNUNET_YES == sock->msg_complete);
   sock->receiver_task = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK;
-  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);
+          &sock->received_buf[msize], sock->received_pos - msize);
   sock->received_pos -= msize;
   sock->msg_complete = GNUNET_NO;
-  sock->receiver_handler = NULL;
+  sock->receiver_handler = NULL;  
   check_complete (sock);
-  handler (cls, msg);
-  GNUNET_free (msg);
+  if (handler != NULL)
+    handler (cls, msg);
 }