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

[gnunet]

Author: grothoff
Date: 2011-05-09 11:57:52 +0200 (Mon, 09 May 2011)
New Revision: 15195

Modified:
   gnunet/src/dht/gnunet-service-dht.c
Log:
fix

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2011-05-09 07:56:59 UTC (rev 15194)
+++ gnunet/src/dht/gnunet-service-dht.c 2011-05-09 09:57:52 UTC (rev 15195)
@@ -5579,10 +5579,22 @@
                              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;
 }