- don't leave freed memory on the peer's path list, signal error and remove anyway

2 files changed, 9 insertions, 2 deletions

diff --git a/src/cadet/cadet_path.c b/src/cadet/cadet_path.c
index 0845f5a00..4f35b2a6c 100644
--- a/src/cadet/cadet_path.c
+++ b/src/cadet/cadet_path.c
@@ -51,8 +51,15 @@ path_destroy_delayed (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   path->path_delete = NULL;
 
   /* During shutdown, the peers peermap might not exist anymore. */
-  if (2 < path->length && (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) == 0)
+  if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) == 0)
   {
+    if (2 >= path->length)
+    {
+      /* This is not the place to destroy direct paths, only core_disconnect
+       * should do it and never delay it.
+       */
+      GNUNET_break (0);
+    }
     peer = GCP_get_short (path->peers[path->length - 1], GNUNET_NO);
     if (NULL != peer)
       GCP_remove_path (peer, path);
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 165553d1c..4a25b0829 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -2214,7 +2214,7 @@ GCP_add_path_to_all (const struct CadetPeerPath *p, int confirmed)
 
 
 /**
- * Remove any path to the peer that has the extact same peers as the one given.
+ * Remove any path to the peer that has the exact same peers as the one given.
  *
  * @param peer Peer to remove the path from.
  * @param path Path to remove. Is always destroyed .