From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 3 Jul 2012 08:26:27 +0000 (+0100)
Subject: DBusTransport: do not assert that autolaunch address is non-empty
X-Git-Tag: dbus-1.6.4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5a945507b045eb46c43da5c0f29a6ee9ab5dbee;p=thirdparty%2Fdbus.git

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 <davidz@redhat.com>
---

diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index ba720f253..6b58fda28 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 */