From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 16 Feb 2019 20:00:38 +0000 (+0100)
Subject: fix assertion failure reported in #5578
X-Git-Tag: v0.11.0~63^2~42^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=613eaaad5798a134ec2d593432622a8f7f135a5d;p=oweals%2Fgnunet.git

fix assertion failure reported in #5578
---

diff --git a/contrib/apparmor/gnunet-mesh b/contrib/apparmor/gnunet-mesh
deleted file mode 100644
index 9f5b07fc5..000000000
--- a/contrib/apparmor/gnunet-mesh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Last Modified: Fri Aug  7 18:02:28 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/bin/gnunet-mesh {
-  #include <abstractions/base>
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/bin/gnunet-mesh mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/gnunet>
-}
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index d85885d64..79108ff2d 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -1246,7 +1246,7 @@ shutdown_task (void *cls)
   while (NULL != hosts_head)
     free_hosts_entry (hosts_head);
   GNUNET_DNSSTUB_stop (dnsstub_ctx);
-  GNUNET_free (my_domain);
+  GNUNET_free_non_null (my_domain);
 }