Merge branch 'wip/nacho/crash-backport-3-36' into 'gnome-3-36'

Backport patches for crash when using Xvfb

See merge request GNOME/gdm!119

1 files changed, 3 insertions, 2 deletions

diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index efcce9b6..6f6c7c90 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -576,10 +576,11 @@ get_display_and_details_for_bus_sender (GdmManager       *self,
                                           lookup_by_session_id,
                                           (gpointer) session_id);
 
+out:
         if (out_display != NULL) {
                 *out_display = display;
         }
-out:
+
         g_free (session_id);
 }
 
@@ -811,7 +812,7 @@ gdm_manager_handle_register_session (GdmDBusManager        *manager,
                                      GVariant              *details)
 {
         GdmManager      *self = GDM_MANAGER (manager);
-        GdmDisplay      *display;
+        GdmDisplay      *display = NULL;
         const char      *sender;
         GDBusConnection *connection;