summaryrefslogtreecommitdiffstats
path: root/crypt-gpgme.c
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2016-10-17 11:23:30 -0700
committerKevin McCarthy <kevin@8t8.us>2016-10-17 11:23:30 -0700
commit53d574383b7b9a3d6953530267538188a21beb56 (patch)
tree3baa509b0650e8b796e83688689bf96cac8c909f /crypt-gpgme.c
parent2c28396ae2a837f22409edec5b8e385092f81f27 (diff)
parentd710f26ad436b0fa18274f26a2af93d461a3587d (diff)
merge stable
Diffstat (limited to 'crypt-gpgme.c')
-rw-r--r--crypt-gpgme.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 3dcce46c..51d5569b 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -673,20 +673,15 @@ static gpgme_key_t *create_recipient_set (const char *keylist,
else
err = gpgme_get_key (context, buf, &key, 0);
+ safe_realloc (&rset, sizeof (*rset) * (rset_n + 1));
if (! err)
- {
- safe_realloc (&rset, sizeof (*rset) * (rset_n + 1));
- rset[rset_n++] = key;
- }
+ rset[rset_n++] = key;
else
{
mutt_error (_("error adding recipient `%s': %s\n"),
buf, gpgme_strerror (err));
- if (rset)
- {
- rset[rset_n] = NULL;
- free_recipient_set (&rset);
- }
+ rset[rset_n] = NULL;
+ free_recipient_set (&rset);
gpgme_release (context);
return NULL;
}