[GNUnet-SVN] r35987 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2015-06-25 05:47:36 +0200 (Thu, 25 Jun 2015)
New Revision: 35987

Modified:
   gnunet/src/cadet/cadet_path.c
Log:
- don't try to retrive a peer during a shutdown task

Modified: gnunet/src/cadet/cadet_path.c
===================================================================
--- gnunet/src/cadet/cadet_path.c       2015-06-25 03:32:25 UTC (rev 35986)
+++ gnunet/src/cadet/cadet_path.c       2015-06-25 03:47:36 UTC (rev 35987)
@@ -48,12 +48,14 @@
   struct CadetPeer *peer;
 
   LOG (GNUNET_ERROR_TYPE_INFO, "Destroy delayed %p (%u)\n", path, 
path->length);
-  if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
-    return;
   path->path_delete = NULL;
-  peer = GCP_get_short (path->peers[path->length - 1]);
-  if (2 < path->length)
+
+  if (2 < path->length && (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) == 0)
+  {
+    /* During shutdown, the peers peermap might not exist anymore. */
+    peer = GCP_get_short (path->peers[path->length - 1]);
     GCP_remove_path (peer, path);
+  }
   else
     path_destroy (path);
 }