[GNUnet-SVN] r13564 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2010-11-05 17:22:18 +0100 (Fri, 05 Nov 2010)
New Revision: 13564

Modified:
   gnunet/src/dht/gnunet-service-dht.c
Log:
memory leak fix (may cause segfaults on exit)

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-11-05 11:27:58 UTC (rev 13563)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-11-05 16:22:18 UTC (rev 13564)
@@ -2922,8 +2922,11 @@
          * value first (always route to closest, because
          * they are sorted.)
          */
+
         if (hops > converge_modifier) /* Past cutoff */
-          return ULLONG_MAX;
+          {
+            return ULLONG_MAX;
+          }
         /* Fall through */
       default:
         return 1;
@@ -3308,11 +3311,13 @@
   GNUNET_CONTAINER_bloomfilter_free(req->bloom);
   GNUNET_free(req);
 
+  /*
   if ((tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) && (0 == 
GNUNET_CONTAINER_multihashmap_size(recent.hashmap)) && (0 == 
GNUNET_CONTAINER_heap_get_size(recent.minHeap)))
   {
     GNUNET_CONTAINER_multihashmap_destroy(recent.hashmap);
     GNUNET_CONTAINER_heap_destroy(recent.minHeap);
   }
+  */
 }
 
 
@@ -4802,6 +4807,10 @@
                             "dht",
                             GNUNET_SERVICE_OPTION_NONE,
                             &run, NULL)) ? 0 : 1;
+  GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size(recent.hashmap));
+  GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size(recent.minHeap));
   GNUNET_CONTAINER_multihashmap_destroy (recent_find_peer_requests);
+  GNUNET_CONTAINER_multihashmap_destroy (recent.hashmap);
+  GNUNET_CONTAINER_heap_destroy (recent.minHeap);
   return ret;
 }