- don't confirm channels scheduled for destruction, client handles are NULL'd

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index 2e52a2ea5..69b158303 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -1114,13 +1114,18 @@ channel_confirm (struct MeshChannel *ch, int fwd)
   struct MeshChannelReliability *rel;
   enum MeshChannelState oldstate;
 
+  rel = fwd ? ch->root_rel : ch->dest_rel;
+  if (NULL == rel)
+  {
+    GNUNET_break (GNUNET_NO != ch->destroy);
+    return;
+  }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
               "  channel confirm %s %s\n",
               GM_f2s (fwd), GMCH_2s (ch));
   oldstate = ch->state;
   ch->state = MESH_CHANNEL_READY;
 
-  rel = fwd ? ch->root_rel : ch->dest_rel;
   rel->client_ready = GNUNET_YES;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "  !! retry timer confirm %s\n",