summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2016-01-22 15:59:00 -0500
committerTim Lunn <tim@feathertop.org>2016-04-14 15:33:06 +1000
commit89260fa22c21c2cee5cf2663f5758e1f23b198e6 (patch)
tree59f7f689ec58d44cf6b3aa1ad85b59f077dfa134
parent4eb0827d65556addb079803ce078e7b319f9dde8 (diff)
downloadgdm-89260fa22c21c2cee5cf2663f5758e1f23b198e6.tar.gz
session: keep session object alive while establishing credentials
The only reference to session objects gets cleaned up when verification-complete is emitted, which happens in the middle of the establish_credentials handler. This commit makes sure the session object stays alive until the handler completes to prevent a crash. https://bugzilla.gnome.org/show_bug.cgi?id=754814
-rw-r--r--daemon/gdm-session.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index affcb359..46e3b180 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -304,8 +304,8 @@ on_establish_credentials_cb (GdmDBusWorker *proxy,
g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
- self = conversation->session;
- service_name = conversation->service_name;
+ self = g_object_ref (conversation->session);
+ service_name = g_strdup (conversation->service_name);
if (worked) {
if (self->priv->user_verifier_interface != NULL) {
@@ -326,6 +326,9 @@ on_establish_credentials_cb (GdmDBusWorker *proxy,
} else {
report_and_stop_conversation (self, service_name, error);
}
+
+ g_free (service_name);
+ g_object_unref (self);
}
static const char **