[Pcsclite-cvs-commit] r424 - trunk/PKCS11/src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-08-01 08:05:26 +0000 (Tue, 01 Aug 2006)
New Revision: 424

Modified:
   trunk/PKCS11/src/p11_session.c
Log:
closeSessionLocked(): fix C_CloseSession segfault after C_Logout with
cards that don't support MSCLogoutAll

See http://archives.neohapsis.com/archives/dev/muscle/2006-q3/0055.html
Thanks to Timothy J. Miller for the patch


Modified: trunk/PKCS11/src/p11_session.c
===================================================================
--- trunk/PKCS11/src/p11_session.c	2006-08-01 07:18:13 UTC (rev 423)
+++ trunk/PKCS11/src/p11_session.c	2006-08-01 08:05:26 UTC (rev 424)
@@ -101,7 +101,8 @@
 
     if (CKR_ERROR(rv = slot_TokenChanged()))
         rv = CKR_DEVICE_REMOVED;
-    else if (!CKR_ERROR(rv = session_FreeSession(session)))
+    else if (!msc_IsTokenChanged(&st.slots[slotID - 1].conn) &&
+		!CKR_ERROR(rv = session_FreeSession(session)))
         rv = slot_ReleaseConnection(slotID);
 
     return rv;