1 files changed, 9 insertions, 7 deletions

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 3a5888734..e7fa7baf0 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -227,6 +227,7 @@ enum Address_State
   FRESH,
 };
 
+
 /**
  * Entry in neighbours.
  */
@@ -246,11 +247,6 @@ struct NeighbourMapEntry
   struct MessageQueue *messages_tail;
 
   /**
-   * Performance data for the peer.
-   */
-  //struct GNUNET_ATS_Information *ats;
-
-  /**
    * Are we currently trying to send a message? If so, which one?
    */
   struct MessageQueue *is_active;
@@ -329,6 +325,7 @@ struct NeighbourMapEntry
    */
   GNUNET_SCHEDULER_TaskIdentifier state_reset;
 
+
   /**
    * How often has the other peer (recently) violated the inbound
    * traffic limit?  Incremented by 10 per violation, decremented by 1
@@ -455,6 +452,8 @@ static void
 reset_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct NeighbourMapEntry *n = cls;
+  if (n == NULL)
+    return;
 
   n->state_reset = GNUNET_SCHEDULER_NO_TASK;
   if (n->state == S_CONNECTED)
@@ -471,8 +470,11 @@ reset_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   n->state = S_NOT_CONNECTED;
 
   /* destroying address */
-  GNUNET_assert (strlen(n->address->transport_name) > 0); 
-  GNUNET_ATS_address_destroyed (GST_ats, n->address, n->session);
+  if (n->address != NULL)
+  {
+    GNUNET_assert (strlen(n->address->transport_name) > 0);
+    GNUNET_ATS_address_destroyed (GST_ats, n->address, n->session);
+  }
 
   /* request new address */
   if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)