Merge branch 'master' of gnunet.org:gnunet

diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index cf39d3b22b166c83acd3352bccf6c30cdb39d64c..9683efcff66e4d9edc9d292a627aa7f916c5856a 100644 (file)
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -464,6 +464,9 @@ replay_key_hash (uint64_t fragment_id, uint64_t message_id,
 static int
 replay_req_remove_cadet (struct Channel *chn)
 {
+  if (NULL == chn || NULL == chn->group)
+    return GNUNET_SYSERR;
+
   struct GNUNET_CONTAINER_MultiHashMap *
     grp_replay_req = GNUNET_CONTAINER_multihashmap_get (replay_req_cadet,
                                                         &chn->group->pub_key_hash);