Changeset ce2d3c0 in OpenSC

Timestamp:

06/21/11 08:41:41 (11 months ago)

Author:

Ludovic Rousseau <ludovic.rousseau+github@…>

Branches:

master, staging

Children:

d3c13fd

Parents:

40cb1c9e

git-author:

Ludovic Rousseau <ludovic.rousseau+github@…> (06/21/11 08:41:41)

git-committer:

Ludovic Rousseau <ludovic.rousseau+github@…> (06/21/11 08:41:41)

Message:

Check the lib is initialized before logging

C_CloseSession() and C_CloseAllSessions() were calling sc_debug() before
any check on the validity of the context. So if C_Initialize() was not
previously called you get an assert:
log.c:76: sc_do_log_va: Assertion `ctx != ((void *)0)' failed.

File:

• src/pkcs11/pkcs11-session.c (modified) (2 diffs)

src/pkcs11/pkcs11-session.c

@@ -138 +138 @@
         CK_RV rv;
 
+        rv = sc_pkcs11_lock();
+        if (rv != CKR_OK)
+                return rv;
+
         sc_debug(context, SC_LOG_DEBUG_NORMAL, "C_CloseSession(0x%lx)\n", hSession);
 
-        rv = sc_pkcs11_lock();
-        if (rv == CKR_OK)
-                rv = sc_pkcs11_close_session(hSession);
+        rv = sc_pkcs11_close_session(hSession);
+
         sc_pkcs11_unlock();
         return rv;
@@ -152 +155 @@
         struct sc_pkcs11_slot *slot;
 
+        rv = sc_pkcs11_lock();
+        if (rv != CKR_OK)
+                return rv;
+
         sc_debug(context, SC_LOG_DEBUG_NORMAL, "C_CloseAllSessions(0x%lx)\n", slotID);
-        rv = sc_pkcs11_lock();
-        if (rv != CKR_OK)
-                return rv;
 
         rv = slot_get_token(slotID, &slot);