From 1644d06c73c9fe34b665277856e5bf9fff84ccb0 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 9 May 2011 09:57:52 +0000
Subject: fix

---
 src/dht/gnunet-service-dht.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 630c6a35b..ebabdfd2f 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -5579,10 +5579,22 @@ main (int argc, char *const *argv)
                              argv,
                              "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;
+  if (NULL != recent.hashmap)
+    {
+      GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (recent.hashmap));
+      GNUNET_CONTAINER_multihashmap_destroy (recent.hashmap);
+      recent.hashmap = NULL;
+    }
+  if (NULL != recent.minHeap)
+    {
+      GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (recent.minHeap));
+      GNUNET_CONTAINER_heap_destroy (recent.minHeap); 
+      recent.minHeap = NULL;
+    }
+  if (NULL != recent_find_peer_requests)
+    {
+      GNUNET_CONTAINER_multihashmap_destroy (recent_find_peer_requests);
+      recent_find_peer_requests = NULL;
+    }
+ return ret;
 }
-- 
cgit v1.2.3