summaryrefslogtreecommitdiffstats
path: root/agent/command.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>2011-04-20 11:33:09 +0200
committerMarcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>2011-04-20 11:33:09 +0200
commit70b871abbc4ec0968152968c10269cee72286df3 (patch)
tree80745794fa04bb7ba2a1d66e46b1df06b46af2c9 /agent/command.c
parentAnother PASSWD --preset fix. (diff)
downloadgnupg2-70b871abbc4ec0968152968c10269cee72286df3.tar.xz
gnupg2-70b871abbc4ec0968152968c10269cee72286df3.zip
Fix gpg-agent secure memory leak in OpenPGP private key import.
2011-04-20 Marcus Brinkmann <mb@g10code.com> * command.c (cmd_import_key): Release key from failed import before converting openpgp private key in the openpgp-private-key case.
Diffstat (limited to '')
-rw-r--r--agent/command.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/agent/command.c b/agent/command.c
index 9f45afbb0..34617ade7 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1827,6 +1827,8 @@ cmd_import_key (assuan_context_t ctx, char *line)
used to protect the key using the same code as for regular
key import. */
+ xfree (key);
+ key = NULL;
err = convert_from_openpgp (ctrl, openpgp_sexp, grip,
ctrl->server_local->keydesc, cache_nonce,
&key, &passphrase);