diff options
| author | NIIBE Yutaka <[email protected]> | 2015-09-28 04:41:59 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-09-28 04:41:59 +0000 |
| commit | 6bb7206e357acfd7276a8f1334c0f0c9cc6ed100 (patch) | |
| tree | 765c1e8bd1567177621be7c66e60b7c5aebce07c | |
| parent | ssh: Add 256, 384 and 521 bit test keys for the fingerprint. (diff) | |
| download | gnupg-6bb7206e357acfd7276a8f1334c0f0c9cc6ed100.tar.gz gnupg-6bb7206e357acfd7276a8f1334c0f0c9cc6ed100.zip | |
scd: Handle error correctly.
* scd/apdu.c (apdu_connect): Initialize variables and check an error
of apdu_get_status_internal.
| -rw-r--r-- | scd/apdu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index e8797cd43..1aebdd331 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -3313,8 +3313,8 @@ apdu_enum_reader (int slot, int *used) int apdu_connect (int slot) { - int sw; - unsigned int status; + int sw = 0; + unsigned int status = 0; if (DBG_READER) log_debug ("enter: apdu_connect: slot=%d\n", slot); @@ -3338,15 +3338,15 @@ apdu_connect (int slot) unlock_slot (slot); } } - else - sw = 0; /* We need to call apdu_get_status_internal, so that the last-status machinery gets setup properly even if a card is inserted while scdaemon is fired up and apdu_get_status has not yet been called. Without that we would force a reset of the card with the next call to apdu_get_status. */ - apdu_get_status_internal (slot, 1, 1, &status, NULL); + if (!sw) + sw = apdu_get_status_internal (slot, 1, 1, &status, NULL); + if (sw) ; else if (!(status & APDU_CARD_PRESENT)) |