summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorTimo Schulz <twoaday@freakmail.de>2003-09-22 22:43:25 +0200
committerTimo Schulz <twoaday@freakmail.de>2003-09-22 22:43:25 +0200
commit47959a306e07127cd87227861b0552a0c639cab1 (patch)
treea3ed3ba412f7bda043f38bdaafa61a50096120fa /g10
parent(parse_ccid_descriptor): New. (diff)
downloadgnupg2-47959a306e07127cd87227861b0552a0c639cab1.tar.xz
gnupg2-47959a306e07127cd87227861b0552a0c639cab1.zip
2003-09-22 Timo Schulz <twoaday@freakmail.de>
* card-util.c (card_status): Free pk in case of an error and return if the card is no OpenPGP card.
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/card-util.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6f53430c3..221961c4e 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-22 Timo Schulz <twoaday@freakmail.de>
+
+ * card-util.c (card_status): Free pk in case of an error
+ and return if the card is no OpenPGP card.
+
2003-09-18 Werner Koch <wk@gnupg.org>
* g10.c: New command --card-edit.
diff --git a/g10/card-util.c b/g10/card-util.c
index 5ee9d03ab..99b40e9df 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -216,6 +216,7 @@ card_status (FILE *fp)
{
log_error (_("OpenPGP card not available: %s\n"),
gpg_strerror (rc));
+ xfree (pk);
return;
}
@@ -226,6 +227,8 @@ card_status (FILE *fp)
{
log_info ("not an OpenPGP card\n");
agent_release_card_info (&info);
+ xfree (pk);
+ return;
}
tty_fprintf (fp, "Version ..........: %.1s%c.%.1s%c\n",
info.serialno[12] == '0'?"":info.serialno+12,