GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Do not clobber R_KEY in gpgme_get_key on error.

Browse Source 
* src/keylist.c (gpgme_get_key): Assign a value to the return
parameter only on success.
--

This problem could be triggered by an ambiguous key.  The problem is
that the key returned in that case is for one not expected and worse
it has not been ref-ed.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-03-20 10:41:18 +01:00
parent 9e1e655483
commit 343d3e2232
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/keylist.c
View File

@ -1261,7 +1261,7 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
{ {
gpgme_ctx_t listctx; gpgme_ctx_t listctx;
gpgme_error_t err; gpgme_error_t err;
gpgme_key_t key; gpgme_key_t result, key;
TRACE_BEG2 (DEBUG_CTX, "gpgme_get_key", ctx, TRACE_BEG2 (DEBUG_CTX, "gpgme_get_key", ctx,
"fpr=%s, secret=%i", fpr, secret); "fpr=%s, secret=%i", fpr, secret);
@ -1295,7 +1295,7 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
err = gpgme_op_keylist_start (listctx, fpr, secret); err = gpgme_op_keylist_start (listctx, fpr, secret);
if (!err) if (!err)
err = gpgme_op_keylist_next (listctx, r_key); err = gpgme_op_keylist_next (listctx, &result);
if (!err) if (!err)
{ {
try_next_key: try_next_key:
@ -1305,9 +1305,9 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
else else
{ {
if (!err if (!err
&& *r_key && (*r_key)->subkeys && (*r_key)->subkeys->fpr && result && result->subkeys && result->subkeys->fpr
&& key && key->subkeys && key->subkeys->fpr && key && key->subkeys && key->subkeys->fpr
&& !strcmp ((*r_key)->subkeys->fpr, key->subkeys->fpr)) && !strcmp (result->subkeys->fpr, key->subkeys->fpr))
{ {
/* The fingerprint is identical. We assume that this is /* The fingerprint is identical. We assume that this is
the same key and don't mark it as an ambiguous. This the same key and don't mark it as an ambiguous. This
@ -1323,12 +1323,14 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
gpgme_key_unref (key); gpgme_key_unref (key);
err = gpg_error (GPG_ERR_AMBIGUOUS_NAME); err = gpg_error (GPG_ERR_AMBIGUOUS_NAME);
} }
gpgme_key_unref (*r_key); gpgme_key_unref (result);
result = NULL;
} }
} }
gpgme_release (listctx); gpgme_release (listctx);
if (! err) if (! err)
{ {
*r_key = result;
TRACE_LOG2 ("key=%p (%s)", *r_key, TRACE_LOG2 ("key=%p (%s)", *r_key,
((*r_key)->subkeys && (*r_key)->subkeys->fpr) ? ((*r_key)->subkeys && (*r_key)->subkeys->fpr) ?
(*r_key)->subkeys->fpr : "invalid"); (*r_key)->subkeys->fpr : "invalid");