giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix MSVC compiler error

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

Thanks to Douglas E. Engert


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3459 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
alonbl 2008-04-04 16:21:08 +00:00
parent ac0c291f9c
commit e4eeba26cd
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pkcs11/pkcs11-global.c
View File

@ -211,7 +211,9 @@ CK_RV C_Initialize(CK_VOID_PTR pInitArgs)
load_pkcs11_parameters(&sc_pkcs11_conf, context);
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;
goto out;
@ -320,21 +322,30 @@ CK_RV C_GetSlotList(CK_BBOOL tokenPresent, /* only slots with token prese
CK_SLOT_ID_PTR pSlotList, /* receives the array of slot IDs */
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;
sc_pkcs11_slot_t *slot;
CK_RV rv;
rv = sc_pkcs11_lock();
if (rv != CKR_OK)
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;
}
sc_debug(context, "Getting slot listing\n");
card_detect_all();
@ -366,7 +377,12 @@ CK_RV C_GetSlotList(CK_BBOOL tokenPresent, /* only slots with token prese
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;
}