security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-11 22:01:08 +02:00
Code Activity

scd: Increment PCSC.COUNT correctly.

Browse Source 
* scd/apdu.c (open_pcsc_reader): PCSC.COUNT should
be incremented before possible call of close_pcsc_reader.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2021-05-07 11:25:20 +09:00
parent 5d1b413106
commit 0498ea8fbd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scd/apdu.c
View File

@ -1237,11 +1237,12 @@ open_pcsc_reader (const char *rdrname)
if (slot == -1) if (slot == -1)
return -1; return -1;
pcsc.count++;
reader_table[slot].rdrname = xtrystrdup (rdrname); reader_table[slot].rdrname = xtrystrdup (rdrname);
if (!reader_table[slot].rdrname) if (!reader_table[slot].rdrname)
{ {
log_error ("error allocating memory for reader name\n"); log_error ("error allocating memory for reader name\n");
close_pcsc_reader (0); close_pcsc_reader (slot);
reader_table[slot].used = 0; reader_table[slot].used = 0;
unlock_slot (slot); unlock_slot (slot);
return -1; return -1;
@ -1258,7 +1259,6 @@ open_pcsc_reader (const char *rdrname)
reader_table[slot].send_apdu_reader = pcsc_send_apdu; reader_table[slot].send_apdu_reader = pcsc_send_apdu;
reader_table[slot].dump_status_reader = dump_pcsc_reader_status; reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
pcsc.count++;
dump_reader_status (slot); dump_reader_status (slot);
unlock_slot (slot); unlock_slot (slot);
return slot; return slot;