From 99d1e3ec5b96b8d3d832b2154b76d3f678e1b691 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 18 Sep 2012 13:58:37 -0400 Subject: slave: fix double free We were a little to excited about memory clean up in x11_session_is_on_seat This commit fixes that and the subsequent crashes. --- daemon/gdm-slave.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c index 9195b9b0..51162f37 100644 --- a/daemon/gdm-slave.c +++ b/daemon/gdm-slave.c @@ -1217,10 +1217,8 @@ x11_session_is_on_seat (GdmSlave *slave, /* don't try to switch to our own session */ if (x11_display == NULL || x11_display[0] == '\0' || strcmp (slave->priv->display_name, x11_display) == 0) { - g_free (x11_display); goto out; } - g_free (x11_display); reply = g_dbus_connection_call_sync (slave->priv->connection, CK_NAME, @@ -1242,7 +1240,6 @@ x11_session_is_on_seat (GdmSlave *slave, g_variant_unref (reply); if (x11_display_device == NULL || x11_display_device[0] == '\0') { - g_free (x11_display_device); goto out; } -- cgit v1.2.1