summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <halfline@gmail.com>2020-09-09 13:33:50 +0000
committerRay Strode <halfline@gmail.com>2020-09-09 13:33:50 +0000
commitbb42414ff1fbf71b8cca0e540aab1b779e9b6dda (patch)
tree3e02eae06460f0cb8010790587c70fb15c58810a
parent6e6ba2fc297b2cdba2ac80016d1f80942b6898a5 (diff)
parentf37d2f01d09c52d1a0df2c34493b59d92f45ae1a (diff)
downloadgdm-bb42414ff1fbf71b8cca0e540aab1b779e9b6dda.tar.gz
Merge branch 'benzea/fix-unknown-session-crash' into 'master'
Benzea/fix unknown session crash Closes #555 See merge request GNOME/gdm!106
-rw-r--r--daemon/gdm-manager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 3249cb9e..459ccf6b 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;