From e5a945507b045eb46c43da5c0f29a6ee9ab5dbee Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 3 Jul 2012 09:26:27 +0100 Subject: [PATCH 1/2] DBusTransport: do not assert that autolaunch address is non-empty dbus-launch can apparently return an empty address under certain circumstances, and dbus_parse_address() in the next line will return a nice DBusError for an empty address rather than aborting the process. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51657 Bug-Debian: http://bugs.debian.org/680027 Reviewed-by: David Zeuthen --- dbus/dbus-transport.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index ba720f25..6b58fda2 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -253,7 +253,6 @@ check_address (const char *address, DBusError *error) int len, i; _dbus_assert (address != NULL); - _dbus_assert (*address != '\0'); if (!dbus_parse_address (address, &entries, &len, error)) return NULL; /* not a valid address */ From d8de80969c090c70e0bfe1d5e68fc7f783fd18e4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 3 Jul 2012 15:53:31 +0100 Subject: [PATCH 2/2] Set enable-developer default to 'no' Misplaced [] and () led to enable_developer=no being part of the option's documentation instead of actually being the default value. Regression in 1.6.2, caused by #34671. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51657 Bug-Debian: http://bugs.debian.org/680027 Reviewed-by: David Zeuthen --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f1b40a0c..698fcd15 100644 --- a/configure.ac +++ b/configure.ac @@ -127,8 +127,9 @@ AM_CONDITIONAL(DBUS_CYGWIN, test "$dbus_cygwin" = yes) # this must come first: other options use this to set their defaults AC_ARG_ENABLE([developer], [AS_HELP_STRING([--enable-developer], - [set defaults to be appropriate for a D-Bus developer instead of a distribution/end-user]), - [], enable_developer=no]) + [set defaults to be appropriate for a D-Bus developer instead of a distribution/end-user])], + [], + [enable_developer=no]) DBUS_STATIC_BUILD_CPPFLAGS= if test "x$enable_shared" = xno; then