[gcr] gck: Keep enumerating if getting info about one slot fails.



commit 4776790b0f3f5ce9ce6a7909022746409c24a5a3
Author: Stef Walter <stefw gnome org>
Date:   Wed Sep 19 10:40:48 2012 +0200

    gck: Keep enumerating if getting info about one slot fails.
    
     * This is happening with the opensc PKCS#11 driver.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=684359

 gck/gck-enumerator.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gck/gck-enumerator.c b/gck/gck-enumerator.c
index 2e11929..16e851c 100644
--- a/gck/gck-enumerator.c
+++ b/gck/gck-enumerator.c
@@ -271,9 +271,11 @@ state_slots (GckEnumeratorState *args, gboolean forward)
 
 		token_info = gck_slot_get_token_info (slot);
 		if (!token_info) {
-			g_message ("couldn't get token info while enumerating");
+			g_message ("couldn't get token info for slot while enumerating");
 			g_object_unref (slot);
-			return rewind_state (args, state_modules);
+
+			/* Skip over this slot to the next slot */
+			return state_slots;
 		}
 
 		/* Do we have unrecognized matches? */



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