Fixme

2 files changed, 11 insertions, 2 deletions

diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c
index 8d5cd776d..758c71e19 100644
--- a/src/dht/gnunet-service-xdht_neighbours.c
+++ b/src/dht/gnunet-service-xdht_neighbours.c
@@ -5127,8 +5127,10 @@ handle_dht_p2p_verify_successor_result(void *cls,
     
     // Cancel Retry Task
     if (GNUNET_SCHEDULER_NO_TASK != send_verify_successor_retry_task)
+    {
       GNUNET_SCHEDULER_cancel(send_verify_successor_retry_task);
-        
+      send_verify_successor_retry_task = GNUNET_SCHEDULER_NO_TASK;
+    }   
     compare_and_update_successor (current_successor,
                                   probable_successor, trail, trail_length);
     
@@ -6025,6 +6027,12 @@ GDS_NEIGHBOURS_done (void)
     GNUNET_SCHEDULER_cancel (send_verify_successor_task);
     send_verify_successor_task = GNUNET_SCHEDULER_NO_TASK;
   }
+
+  if (GNUNET_SCHEDULER_NO_TASK != send_verify_successor_retry_task)
+  {
+    GNUNET_SCHEDULER_cancel (send_verify_successor_retry_task);
+    send_verify_successor_retry_task = GNUNET_SCHEDULER_NO_TASK;
+  }
 }
 
 
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index bc1ee86d8..98ea16bec 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -564,7 +564,8 @@ get_iter (void *cls,
   get_ac->nrefs--;
   GNUNET_DHT_get_stop (ac->dht_get);
   ac->dht_get = NULL;
-  GNUNET_SCHEDULER_cancel (ac->delay_task);
+  if (ac->delay_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (ac->delay_task);
   ac->delay_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_assert (NULL != ctx->op);
   GNUNET_TESTBED_operation_done (ctx->op);