[GNUnet-SVN] [gnunet] branch master updated: fix assertion failure reported in #5578

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 613eaaad5 fix assertion failure reported in #5578
     new d78e50fef Merge branch 'master' of git+ssh://gnunet.org/gnunet
613eaaad5 is described below

commit 613eaaad5798a134ec2d593432622a8f7f135a5d
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Feb 16 21:00:38 2019 +0100

    fix assertion failure reported in #5578
---
 contrib/apparmor/gnunet-mesh       | 13 -------------
 src/util/gnunet-service-resolver.c |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

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);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden