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

fixed 320270 Dereference after null check

This commit is contained in:
Frank Morgner 2019-01-04 00:34:32 +01:00
parent aa940e8619
commit 5c50dc58da
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pkcs11/framework-pkcs15.c
View File

@ -1094,7 +1094,8 @@ pkcs15_init_slot(struct sc_pkcs15_card *p15card, struct sc_pkcs11_slot *slot,
/* Trim tokeninfo->label to make right parenthesis visible */
char tokeninfo_label[sizeof(p15card->tokeninfo->label)+1];
int len;
snprintf(tokeninfo_label, sizeof(tokeninfo_label), "%s", p15card->tokeninfo->label);
snprintf(tokeninfo_label, sizeof(tokeninfo_label), "%s",
p15card->tokeninfo ? p15card->tokeninfo->label : "");
tokeninfo_label[sizeof(tokeninfo_label)-1] = '\0';
for (len = strlen(tokeninfo_label) - 1; len >= 0 && isspace(tokeninfo_label[len]); len--) {
tokeninfo_label[len] = 0;
@ -1104,12 +1105,14 @@ pkcs15_init_slot(struct sc_pkcs15_card *p15card, struct sc_pkcs11_slot *slot,
tokeninfo_label);
} else
/* The PIN label is empty or says just non-useful "PIN" */
snprintf(label, sizeof(label), "%s", p15card->tokeninfo->label);
snprintf(label, sizeof(label), "%s",
p15card->tokeninfo ? p15card->tokeninfo->label : "");
slot->token_info.flags |= CKF_LOGIN_REQUIRED;
}
}
else {
snprintf(label, sizeof(label), "%s", p15card->tokeninfo->label);
snprintf(label, sizeof(label), "%s",
p15card->tokeninfo ? p15card->tokeninfo->label : "");
}
strcpy_bp(slot->token_info.label, label, 32);