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

tests: Fix card present check 

Check SC_READER_CARD_PRESENT flag rather than == 1.
Having no card present on the first loop and then inserting a card will
return rc = CARD_PRESENT | CARD_CHANGED (= 3). SEGFAULT ensures when we mistake
the unset opt_reader as having a present card.
This commit is contained in:
Torin Carey 2020-05-18 01:36:22 +01:00 committed by Frank Morgner
parent 57f538810e
commit 93bed892a8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tests/sc-test.c
View File

@ -83,18 +83,22 @@ int sc_test_init(int *argc, char *argv[])
if (rc < 0)
return rc;
} else {
for (i = rc = 0; rc != 1 && i < (int) sc_ctx_get_reader_count(ctx); i++)
for (i = rc = 0; !(rc & SC_READER_CARD_PRESENT) &&
i < (int) sc_ctx_get_reader_count(ctx); i++)
rc = sc_detect_card_presence(sc_ctx_get_reader(ctx, i));
if (rc == 1)
if (rc < 0)
return rc;
if (rc & SC_READER_CARD_PRESENT) {
opt_reader = i - 1;
} else {
rc = 0;
}
}
if (rc > 0) {
printf("Card detected in reader '%s'\n",sc_ctx_get_reader(ctx, opt_reader)->name);
break;
}
if (rc < 0)
return rc;
printf("Please insert a smart card. Press return to continue");
fflush(stdout);