[GNUnet-SVN] r30329 - gnunet/src/psyc

[gnunet]

Author: grothoff
Date: 2013-10-18 17:02:58 +0200 (Fri, 18 Oct 2013)
New Revision: 30329

Modified:
   gnunet/src/psyc/psyc_api.c
Log:
-fix bad allocation and message size calculation

Modified: gnunet/src/psyc/psyc_api.c
===================================================================
--- gnunet/src/psyc/psyc_api.c  2013-10-18 14:59:27 UTC (rev 30328)
+++ gnunet/src/psyc/psyc_api.c  2013-10-18 15:02:58 UTC (rev 30329)
@@ -788,10 +788,9 @@
 {
   struct GNUNET_PSYC_Slave *slv = GNUNET_malloc (sizeof (*slv));
   struct GNUNET_PSYC_Channel *ch = &slv->ch;
-  struct SlaveJoinRequest *req = GNUNET_malloc (sizeof (*req));
-
+  struct SlaveJoinRequest *req = GNUNET_malloc (sizeof (*req)
+                                                + relay_count * sizeof 
(*relays));
   req->header.size = htons (sizeof (*req)
-                            + sizeof (*channel_key) + sizeof (*slave_key)
                             + relay_count * sizeof (*relays));
   req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN);
   req->channel_key = *channel_key;