From 47d9e8eb52f1854461b09bb7141d6e5684e6c751 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Thu, 4 Jul 2013 12:34:25 -0400 Subject: [PATCH] Fix caching issue in commit 1175663. --- src/commands.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/commands.c b/src/commands.c index f7ed066a..88959bc9 100644 --- a/src/commands.c +++ b/src/commands.c @@ -341,19 +341,22 @@ open_finalize (assuan_context_t ctx, char *key, size_t keylen) } } - gcry_free (salted_key); - salted_key = NULL; - if (client->pinentry_opts.title != pin_title) xfree (client->pinentry_opts.title); client->pinentry_opts.title = pin_title; if (rc) - return rc; + { + gcry_free (salted_key); + return rc; + } cdata = xcalloc (1, sizeof (struct cache_data_s)); if (!cdata) - return GPG_ERR_ENOMEM; + { + gcry_free (salted_key); + return GPG_ERR_ENOMEM; + } cdata->key = salted_key; cdata->keylen = keysize; -- 2.11.4.GIT