From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 22 Apr 2009 07:42:01 +0000 (+0200)
Subject: dbus/dbus-transport.c: _dbus_credentials_get_windows_sid might return NULL (cherry... 
X-Git-Tag: dbus-1.3.1~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c5456c337c65d43f0a2bc1be14beb6391441239;p=thirdparty%2Fdbus.git

dbus/dbus-transport.c: _dbus_credentials_get_windows_sid might return NULL (cherry picked from commit 8d8d5fa1babc8f51f1d1bb95b8116850978c60d9)
---

diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 40a1ce15c..d8f34eefa 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -660,8 +660,10 @@ auth_via_default_rules (DBusTransport *transport)
       if (_dbus_credentials_include(our_identity,DBUS_CREDENTIAL_WINDOWS_SID))
           _dbus_verbose ("Client authorized as SID '%s'"
                          " but our SID is '%s', disconnecting\n",
-                         _dbus_credentials_get_windows_sid(auth_identity),
-                         _dbus_credentials_get_windows_sid(our_identity));
+                         (_dbus_credentials_get_windows_sid(auth_identity) ?
+                          _dbus_credentials_get_windows_sid(auth_identity) : "<null>"),
+                         (_dbus_credentials_get_windows_sid(our_identity) ?
+                          _dbus_credentials_get_windows_sid(our_identity) : "<null>"));
       else
           _dbus_verbose ("Client authorized as UID "DBUS_UID_FORMAT
                          " but our UID is "DBUS_UID_FORMAT", disconnecting\n",