[gnome-keyring] Fix a couple more minor memory leaks.



commit 767bac01f7800d26553af73dc28c0f4ee9877416
Author: Stef Walter <stef memberwebs com>
Date:   Tue Jul 21 14:04:49 2009 +0000

    Fix a couple more minor memory leaks.
    
    Fix memory leaks highlighted by the valgrind trace on bug #588443

 daemon/gkr-daemon-dbus.c          |    1 +
 pkcs11/gck/gck-session.c          |    2 ++
 pkcs11/ssh-store/gck-ssh-module.c |    2 ++
 3 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/daemon/gkr-daemon-dbus.c b/daemon/gkr-daemon-dbus.c
index c0d6f7c..fb6eb1b 100644
--- a/daemon/gkr-daemon-dbus.c
+++ b/daemon/gkr-daemon-dbus.c
@@ -203,6 +203,7 @@ register_environment_in_session (void)
 		
 		if (!reply) {
 			g_message ("couldn't set environment variable in session: %s", derr.message);
+			dbus_error_free (&derr);
 			return;
 		}
 		
diff --git a/pkcs11/gck/gck-session.c b/pkcs11/gck/gck-session.c
index 0d94fa8..1cfcf27 100644
--- a/pkcs11/gck/gck-session.c
+++ b/pkcs11/gck/gck-session.c
@@ -156,6 +156,8 @@ prepare_crypto (GckSession *self, CK_MECHANISM_PTR mech,
 			have = TRUE;
 	}
 	
+	g_free (mechanisms);
+
 	if (have == FALSE)
 		return CKR_KEY_TYPE_INCONSISTENT;
 
diff --git a/pkcs11/ssh-store/gck-ssh-module.c b/pkcs11/ssh-store/gck-ssh-module.c
index 2dbe909..98521b8 100644
--- a/pkcs11/ssh-store/gck-ssh-module.c
+++ b/pkcs11/ssh-store/gck-ssh-module.c
@@ -144,6 +144,8 @@ file_load (GckFileTracker *tracker, const gchar *path, GckSshModule *self)
 		if (!gck_object_get_manager (GCK_OBJECT (pubkey)))
 			gck_manager_register_object (manager, GCK_OBJECT (pubkey));
 	}
+
+	g_free (private_path);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]