aboutsummaryrefslogtreecommitdiffstats
path: root/src/keylist.c
diff options
context:
space:
mode:
authorBen McGinnes <[email protected]>2018-03-29 23:38:31 +0000
committerBen McGinnes <[email protected]>2018-03-29 23:38:31 +0000
commitfed024eff1091056647296ac589a0c88c2be41bb (patch)
tree92107918246e3e9f9660ee06d9668868fed473ca /src/keylist.c
parentMerge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme (diff)
parentjson: Build only a dummy if libgpg-error is < 1.28 (diff)
downloadgpgme-fed024eff1091056647296ac589a0c88c2be41bb.tar.gz
gpgme-fed024eff1091056647296ac589a0c88c2be41bb.zip
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
* Also fixed a small grammatical error highlighted by a merge conflict (in the python bindings howto).
Diffstat (limited to 'src/keylist.c')
-rw-r--r--src/keylist.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/keylist.c b/src/keylist.c
index 7956935b..9c5bd4ea 100644
--- a/src/keylist.c
+++ b/src/keylist.c
@@ -1269,6 +1269,8 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
if (!ctx || !r_key || !fpr)
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+ *r_key = NULL;
+
if (strlen (fpr) < 8) /* We have at least a key ID. */
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));