diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/apdu.c | 5 | ||||
| -rw-r--r-- | g10/options.skel | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 8c5c474dd..f43a6384c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2004-10-28 Werner Koch <[email protected]> + + * apdu.c (open_pcsc_reader): Removed bad free in error handler. + 2004-10-27 David Shaw <[email protected]> * card-util.c, delkey.c, keygen.c, plaintext.c, keyedit.c, diff --git a/g10/apdu.c b/g10/apdu.c index f4b32d141..c75efd122 100644 --- a/g10/apdu.c +++ b/g10/apdu.c @@ -1482,6 +1482,7 @@ open_pcsc_reader (const char *portstr) } strcpy (reader_table[slot].rdrname, portstr? portstr : list); xfree (list); + list = NULL; err = pcsc_connect (reader_table[slot].pcsc.context, reader_table[slot].rdrname, @@ -1495,11 +1496,11 @@ open_pcsc_reader (const char *portstr) { log_error ("pcsc_connect failed: %s (0x%lx)\n", pcsc_error_string (err), err); - pcsc_release_context (reader_table[slot].pcsc.context); + + pcsc_release_context (reader_table[slot].pcsc.context); xfree (reader_table[slot].rdrname); reader_table[slot].rdrname = NULL; reader_table[slot].used = 0; - xfree (list); return -1; } diff --git a/g10/options.skel b/g10/options.skel index 17dc06001..cf5033bef 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -58,7 +58,8 @@ # for supported character sets. This character set is only used for # metadata and not for the actual message which does not undergo any # translation. Note that future version of GnuPG will change to UTF-8 -# as default character set. +# as default character set. In most cases this option is not required +# GnuPG is able to figure out the correct charset and use that. #charset utf-8 |