gnome-keyring r1631 - in trunk: . daemon/pkcs11 pkcs11/gck

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb 28 03:05:40 2009
New Revision: 1631
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1631&view=rev

Log:
Remove erroneous assertion. Fix double free.

Modified:
   trunk/ChangeLog
   trunk/daemon/pkcs11/gkr-pkcs11-auth.c
   trunk/pkcs11/gck/gck-data-file.c

Modified: trunk/daemon/pkcs11/gkr-pkcs11-auth.c
==============================================================================
--- trunk/daemon/pkcs11/gkr-pkcs11-auth.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-auth.c	Sat Feb 28 03:05:40 2009
@@ -375,7 +375,6 @@
 	secondary = g_strdup_printf (_("An application wants access to the certificate/key storage '%s', but it is locked"), label);
 	gkr_ask_request_set_secondary (ask, secondary);
 	g_free (secondary);
-	g_free (label);
 	
 	if (gkr_keyring_login_is_usable ())
 		gkr_ask_request_set_check_option (ask, _("Automatically unlock secure storage when I log in."));

Modified: trunk/pkcs11/gck/gck-data-file.c
==============================================================================
--- trunk/pkcs11/gck/gck-data-file.c	(original)
+++ trunk/pkcs11/gck/gck-data-file.c	Sat Feb 28 03:05:40 2009
@@ -719,7 +719,6 @@
 	
 	g_assert (GCK_IS_DATA_FILE (self));
 	g_assert (buffer);
-	g_assert (offset);
 	
 	offset = 0;