Bug 1418985 - pass valid error parameter to dbus_bus_get() instead of nullptr, jhorak
MozReview-Commit-ID: 2pjjSSd7DOI
--- a/toolkit/components/remote/nsDBusRemoteService.cpp
+++ b/toolkit/components/remote/nsDBusRemoteService.cpp
@@ -157,27 +157,30 @@ nsDBusRemoteService::Startup(const char*
if (mConnection && dbus_connection_get_is_connected(mConnection)) {
// We're already connected so we don't need to reconnect
return NS_ERROR_ALREADY_INITIALIZED;
}
mAppName = aAppName;
ToLowerCase(mAppName);
+ DBusError err;
+ dbus_error_init(&err);
mConnection = already_AddRefed<DBusConnection>(
- dbus_bus_get(DBUS_BUS_SESSION, nullptr));
- if (!mConnection)
+ dbus_bus_get(DBUS_BUS_SESSION, &err));
+ if (dbus_error_is_set(&err)) {
+ dbus_error_free(&err);
return NS_ERROR_FAILURE;
+ }
dbus_connection_set_exit_on_disconnect(mConnection, false);
nsAutoCString interfaceName;
interfaceName = nsPrintfCString("org.mozilla.%s.%s", aAppName, aProfileName);
- DBusError err;
dbus_error_init(&err);
dbus_bus_request_name(mConnection, interfaceName.get(),
DBUS_NAME_FLAG_DO_NOT_QUEUE, &err);
// The interface is already owned - there is another application/profile
// instance already running.
if (dbus_error_is_set(&err)) {
dbus_error_free(&err);
mConnection = nullptr;