summaryrefslogtreecommitdiffstats
path: root/crypt-gpgme.c
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2016-10-16 14:17:51 -0700
committerKevin McCarthy <kevin@8t8.us>2016-10-16 14:17:51 -0700
commitf51e6468df5ea99b382ece42c13ca4509a11169f (patch)
treed8a2350384901ddf890bf8b0ddd67c9d6e0b3821 /crypt-gpgme.c
parent98560945032dba291415ed001fe5c6bb6d6b1bc0 (diff)
parentf3697a744da54089f5f58561e8ed44add5f7c0e0 (diff)
merge stable
Diffstat (limited to 'crypt-gpgme.c')
-rw-r--r--crypt-gpgme.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index f7f1d722..3dcce46c 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -682,8 +682,11 @@ static gpgme_key_t *create_recipient_set (const char *keylist,
{
mutt_error (_("error adding recipient `%s': %s\n"),
buf, gpgme_strerror (err));
- rset[rset_n] = NULL;
- free_recipient_set (&rset);
+ if (rset)
+ {
+ rset[rset_n] = NULL;
+ free_recipient_set (&rset);
+ }
gpgme_release (context);
return NULL;
}