Merge branch 'master' of ssh://gnunet.org/gnunet

2 files changed, 3 insertions, 1 deletions

diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 2d3b548dd..c8d69e43d 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -1027,7 +1027,8 @@ handle_drop_message (void *cls,
   ch = lookup_channel (c,
                        message->ccn);
 
-  GCCH_assign_type_to_drop (ch, message);
+  if (NULL != ch)
+    GCCH_assign_type_to_drop (ch, message);
 
   GNUNET_SERVICE_client_continue (c->client);
 }
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 6b22ae2b4..ae5d9210f 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -1858,6 +1858,7 @@ GCCH_handle_local_data (struct CadetChannel *ch,
     }
     else
     {
+      GNUNET_free (env);
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }