oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

zeroconf/Avahi: call dbus_shutdown() during shutdown 

Make valgrind happy.
This commit is contained in:
Max Kellermann 2014-06-10 23:00:47 +02:00
parent dfcb572985
commit 31e29e62f4
3 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -825,7 +825,7 @@ avahi)
;; ;;
esac esac
MPD_AUTO_PKG(avahi, AVAHI, [avahi-client], MPD_AUTO_PKG(avahi, AVAHI, [avahi-client dbus-1],
[avahi client library], [avahi-client not found]) [avahi client library], [avahi-client not found])
if test x$enable_avahi = xyes; then if test x$enable_avahi = xyes; then
AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support]) AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])

4
src/zeroconf/ZeroconfAvahi.cxx
View File

@ -34,6 +34,8 @@
#include <avahi-common/malloc.h> #include <avahi-common/malloc.h>
#include <avahi-common/error.h> #include <avahi-common/error.h>
#include <dbus/dbus.h>
static constexpr Domain avahi_domain("avahi"); static constexpr Domain avahi_domain("avahi");
static char *avahiName; static char *avahiName;
@ -272,4 +274,6 @@ AvahiDeinit(void)
avahi_free(avahiName); avahi_free(avahiName);
avahiName = nullptr; avahiName = nullptr;
dbus_shutdown();
} }

28
valgrind.suppressions
View File

@ -297,34 +297,6 @@
fun:dlclose fun:dlclose
} }
# is that a leak in libdbus?
{
<insert a suppression name here>
Memcheck:Leak
fun:?alloc
...
obj:*/libdbus-*.so.*
fun:avahi_client_new
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
obj:/usr/lib/libdbus-1.so.3.4.0
fun:dbus_message_new_error
obj:/usr/lib/libdbus-1.so.3.4.0
fun:dbus_connection_send_with_reply
fun:dbus_connection_send_with_reply_and_block
obj:/usr/lib/libavahi-client.so.3.2.4
fun:avahi_entry_group_new
fun:avahiRegisterService
fun:avahiClientCallback
obj:/usr/lib/libavahi-client.so.3.2.4
fun:avahi_client_new
}
{ {
inet_ntoa inet_ntoa
Memcheck:Leak Memcheck:Leak