From 6e3f94b3c9c694c872a364919604a6e3ef56ecb7 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Thu, 10 Sep 2015 08:31:30 +0200 Subject: [PATCH] fixed bad string comparison fixes #547 --- src/libopensc/pkcs15.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c index ba9d6125..f7c49ef2 100644 --- a/src/libopensc/pkcs15.c +++ b/src/libopensc/pkcs15.c @@ -424,8 +424,9 @@ fix_starcos_pkcs15_card(struct sc_pkcs15_card *p15card) if (strcmp(p15card->card->driver->short_name,"cardos") == 0) { /* D-Trust cards (D-TRUST, D-SIGN) */ - if (strstr(p15card->tokeninfo->label,"D-TRUST") != NULL - || strstr(p15card->tokeninfo->label,"D-SIGN") != NULL) { + if (p15card->tokeninfo->label + && (strstr(p15card->tokeninfo->label,"D-TRUST") != NULL + || strstr(p15card->tokeninfo->label,"D-SIGN") != NULL)) { /* D-TRUST Card 2.0 2cc (standard cards, which always add * SHA1 prefix itself */