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

[gnunet]

Author: grothoff
Date: 2012-03-29 14:34:38 +0200 (Thu, 29 Mar 2012)
New Revision: 20807

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

Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2012-03-29 12:34:33 UTC (rev 
20806)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2012-03-29 12:34:38 UTC (rev 
20807)
@@ -1153,12 +1153,18 @@
     GNUNET_SCHEDULER_cancel (retry_task);
     retry_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (retry_heap));
-  GNUNET_CONTAINER_heap_destroy (retry_heap);
-  retry_heap = NULL;
-  GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (forward_map));
-  GNUNET_CONTAINER_multihashmap_destroy (forward_map);
-  forward_map = NULL;
+  if (NULL != retry_heap)
+  {
+    GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (retry_heap));
+    GNUNET_CONTAINER_heap_destroy (retry_heap);
+    retry_heap = NULL;
+  }
+  if (NULL != forward_map)
+  {
+    GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (forward_map));
+    GNUNET_CONTAINER_multihashmap_destroy (forward_map);
+    forward_map = NULL;
+  }
 }
 
 /* end of gnunet-service-dht_clients.c */