Changeset 3459 for trunk/src

Timestamp:

04/04/08 16:21:08 (9 months ago)

Author:

alonbl

Message:

Fix MSVC compiler error

http://www.opensc-project.org/pipermail/opensc-devel/2008-April/010997.html

Thanks to Douglas E. Engert

Files:

• trunk/src/pkcs11/pkcs11-global.c (modified) (4 diffs)

trunk/src/pkcs11/pkcs11-global.c

@@ -212 +212 @@
 
         first_free_slot = 0;
-        virtual_slots = malloc(sizeof (*virtual_slots) * sc_pkcs11_conf.pkcs11_max_virtual_slots);
+        virtual_slots = (struct sc_pkcs11_slot *)malloc(
+                sizeof (*virtual_slots) * sc_pkcs11_conf.pkcs11_max_virtual_slots
+        );
         if (virtual_slots == NULL) {
                 rv = CKR_HOST_MEMORY;
@@ -321 +323 @@
                     CK_ULONG_PTR   pulCount)      /* receives the number of slots */
 {
-        CK_SLOT_ID found[sc_pkcs11_conf.pkcs11_max_virtual_slots];
+        CK_SLOT_ID_PTR found = NULL;
         int i;
         CK_ULONG numMatches;
@@ -327 +329 @@
         CK_RV rv;
 
-        rv = sc_pkcs11_lock();
-        if (rv != CKR_OK)
-                return rv;
+        if ((rv = sc_pkcs11_lock()) != CKR_OK) {
+                return rv;
+        }
 
         if (pulCount == NULL_PTR) {
                 rv = CKR_ARGUMENTS_BAD;
+                goto out;
+        }
+
+        if (
+                (found = (CK_SLOT_ID_PTR)malloc (
+                        sizeof (*found) * sc_pkcs11_conf.pkcs11_max_virtual_slots
+                )) == NULL
+        ) {
+                rv = CKR_HOST_MEMORY;
                 goto out;
         }
@@ -367 +378 @@
         sc_debug(context, "returned %d slots\n", numMatches);
 
-out:    sc_pkcs11_unlock();
+out:
+        if (found != NULL) {
+                free (found);
+                found = NULL;
+        }
+        sc_pkcs11_unlock();
         return rv;
 }