-support join_msg=NULL properly

2 files changed, 35 insertions, 15 deletions

diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index 4c1b3f1d7..f4e37865f 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -943,10 +943,18 @@ client_recv_multicast_message (void *cls, struct GNUNET_SERVER_Client *client,
 {
   struct Group *
     grp = GNUNET_SERVER_client_get_user_context (client, struct Group);
+  const struct GNUNET_MULTICAST_MessageHeader *
+    msg = (const struct GNUNET_MULTICAST_MessageHeader *) m;
+  struct Origin *orig;
+
+  if (NULL == grp)
+  {
+    GNUNET_break (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return;
+  }
   GNUNET_assert (GNUNET_YES == grp->is_origin);
-  struct Origin *orig = (struct Origin *) grp;
-  struct GNUNET_MULTICAST_MessageHeader *
-    msg = (struct GNUNET_MULTICAST_MessageHeader *) m;
+  orig = (struct Origin *) grp;
 
   msg->fragment_id = GNUNET_htonll (++orig->max_fragment_id);
   msg->purpose.size = htonl (ntohs (msg->header.size)
@@ -975,13 +983,19 @@ static void
 client_recv_multicast_request (void *cls, struct GNUNET_SERVER_Client *client,
                                const struct GNUNET_MessageHeader *m)
 {
-  struct Group *
-    grp = GNUNET_SERVER_client_get_user_context (client, struct Group);
-  GNUNET_assert (GNUNET_NO == grp->is_origin);
-  struct Member *mem = (struct Member *) grp;
+  struct Group *grp = GNUNET_SERVER_client_get_user_context (client, struct Group);
+  struct Member *mem;
+  const struct GNUNET_MULTICAST_RequestHeader *
+    req = (const struct GNUNET_MULTICAST_RequestHeader *) m;
 
-  struct GNUNET_MULTICAST_RequestHeader *
-    req = (struct GNUNET_MULTICAST_RequestHeader *) m;
+  if (NULL == grp)
+  {
+    GNUNET_break (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return;
+  }
+  GNUNET_assert (GNUNET_NO == grp->is_origin);
+  mem = (struct Member *) grp;
 
   req->fragment_id = GNUNET_ntohll (++mem->max_fragment_id);
   req->purpose.size = htonl (ntohs (req->header.size)
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index 8cce89704..96aad28ba 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -854,11 +854,15 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
 {
   struct GNUNET_PSYC_Slave *slv = GNUNET_malloc (sizeof (*slv));
   struct GNUNET_PSYC_Channel *chn = &slv->chn;
-
   uint16_t relay_size = relay_count * sizeof (*relays);
-  uint16_t join_msg_size = ntohs (join_msg->header.size);
-  struct SlaveJoinRequest *req
-    = GNUNET_malloc (sizeof (*req) + relay_size + join_msg_size);
+  uint16_t join_msg_size;
+  struct SlaveJoinRequest *req;
+
+  if (NULL == join_msg)
+    join_msg_size = 0;
+  else
+    join_msg_size = ntohs (join_msg->header.size);
+  req = GNUNET_malloc (sizeof (*req) + relay_size + join_msg_size);
   req->header.size = htons (sizeof (*req)
                             + relay_count * sizeof (*relays));
   req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN);
@@ -870,8 +874,10 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
   if (0 < relay_size)
     memcpy (&req[1], relays, relay_size);
 
-  if (0 < join_msg_size)
-    memcpy ((char *) &req[1] + relay_size, join_msg, join_msg_size);
+  if (NULL != join_msg)
+    memcpy ((char *) &req[1] + relay_size,
+            join_msg,
+            join_msg_size);
 
   chn->connect_msg = (struct GNUNET_MessageHeader *) req;
   chn->cfg = cfg;