AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

mir: Fix potential use of NULL GDBusConnection

Browse Source 
If we fail to connect to the session bus, it would be a bit silly to
immediately try and use that NULL connection.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=668590
This commit is contained in:
Philip Withnall 2017-11-17 10:32:02 +00:00
parent fec0dc2b13
commit 276c462553
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdk/mir/gdkmirdisplay.c
View File

@ -176,6 +176,7 @@ _gdk_mir_display_open (const gchar *display_name)
MirPixelFormat sw_pixel_format, hw_pixel_format;
GdkMirDisplay *display;
GDBusConnection *session;
GError *error = NULL;
connection = mir_connect_sync (NULL, g_get_prgname ());
if (!connection)
@ -208,7 +209,15 @@ _gdk_mir_display_open (const gchar *display_name)
display->sw_pixel_format = sw_pixel_format;
display->hw_pixel_format = hw_pixel_format;
session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
if (session == NULL)
{
g_error ("Error connecting to D-Bus session bus: %s", error->message);
g_clear_error (&error);
mir_connection_release (connection);
return NULL;
}
display->content_service = content_hub_service_proxy_new_sync (
session,