Make sure objects are cleaned up on exit, Fix minor memory leaks

1 files changed, 12 insertions, 2 deletions

diff --git a/src/xsession.c b/src/xsession.c
index 550d556f..1b61e4a2 100644
--- a/src/xsession.c
+++ b/src/xsession.c
@@ -35,7 +35,7 @@ XSession *
 xsession_new (XServer *xserver)
 {
     XSession *session = g_object_new (XSESSION_TYPE, NULL);
-  
+
     session->priv->xserver = g_object_ref (xserver);
 
     return session;
@@ -127,14 +127,20 @@ xsession_remove_authority (XSession *session)
     if (session->priv->authority_file)
     {
         gboolean drop_privileges;
+        gchar *path;
       
         drop_privileges = geteuid () == 0;
         if (drop_privileges)
             privileges_drop (session_get_user (SESSION (session)));
-        g_debug ("Removing session authority from %s", g_file_get_path (session->priv->authority_file));
+
+        path = g_file_get_path (session->priv->authority_file);
+        g_debug ("Removing session authority from %s", path);
+        g_free (path);
         xauth_write (session->priv->authority, XAUTH_WRITE_MODE_REMOVE, session->priv->authority_file, NULL);
+
         if (drop_privileges)
             privileges_reclaim ();
+
         g_object_unref (session->priv->authority_file);
         session->priv->authority_file = NULL;
     }
@@ -168,6 +174,10 @@ xsession_finalize (GObject *object)
     xsession_remove_authority (self);
     if (self->priv->xserver)
         g_object_unref (self->priv->xserver);
+    if (self->priv->authority)
+        g_object_unref (self->priv->authority);
+    if (self->priv->authority_file)
+        g_object_unref (self->priv->authority_file);
 
     G_OBJECT_CLASS (xsession_parent_class)->finalize (object);
 }