-fix crash observed on FreeBSD

1 files changed, 10 insertions, 3 deletions

diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c
index 8a7e747c6..df45cd516 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -536,7 +536,11 @@ process_notify (void *cls,
   if (NULL != builder)
   {
     /* restart re-build already in progress ... */
-    GNUNET_PEERINFO_iterate_cancel (builder->pitr);
+    if (NULL != builder->pitr)
+    {
+      GNUNET_PEERINFO_iterate_cancel (builder->pitr);
+      builder->pitr = NULL;
+    }
     GNUNET_free_non_null (builder->data);
     builder->size = 0;
     builder->data = NULL;
@@ -870,8 +874,11 @@ GNUNET_HOSTLIST_server_stop ()
   }
   if (NULL != builder)
   {
-    GNUNET_PEERINFO_iterate_cancel (builder->pitr);
-    builder->pitr = NULL;
+    if (NULL != builder->pitr)
+    {
+      GNUNET_PEERINFO_iterate_cancel (builder->pitr);
+      builder->pitr = NULL;
+    }
     GNUNET_free_non_null (builder->data);
     GNUNET_free (builder);
   }