diff options
| author | Justus Winter <justus@g10code.com> | 2016-11-15 15:08:54 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2016-11-15 15:38:09 +0100 |
| commit | 1d03cc77e1706f7da653153ad4b58c61e4fd2573 (patch) | |
| tree | 18792f056c00b2343d6c8b82c7a5833760b41cfd /g10 | |
| parent | g10: Fix use-after-free. (diff) | |
| download | gnupg2-1d03cc77e1706f7da653153ad4b58c61e4fd2573.tar.xz gnupg2-1d03cc77e1706f7da653153ad4b58c61e4fd2573.zip | |
g10: Fix iteration over getkey results.
* g10/getkey.c (getkey_next): Fix invocation of 'lookup'. If we want
to use RET_FOUND_KEY, RET_KEYBLOCK must be valid.
Fixes-commit: 8ea72a776a88f3c851e812d258355be80caa1bc1
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/getkey.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index bf197b26e..62323639b 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2167,6 +2167,7 @@ gpg_error_t getkey_next (getkey_ctx_t ctx, PKT_public_key *pk, kbnode_t *ret_keyblock) { int rc; /* Fixme: Make sure this is proper gpg_error */ + KBNODE keyblock = NULL; KBNODE found_key = NULL; /* We need to disable the caching so that for an exact key search we @@ -2175,11 +2176,18 @@ getkey_next (getkey_ctx_t ctx, PKT_public_key *pk, kbnode_t *ret_keyblock) used without respecting the current file pointer! */ keydb_disable_caching (ctx->kr_handle); + /* FOUND_KEY is only valid as long as RET_KEYBLOCK is. If the + * caller wants PK, but not RET_KEYBLOCK, we need hand in our own + * keyblock. */ + if (pk && ret_keyblock == NULL) + ret_keyblock = &keyblock; + rc = lookup (ctx, ret_keyblock, &found_key, ctx->want_secret); if (!rc && pk) { log_assert (found_key); pk_from_block (pk, NULL, found_key); + release_kbnode (keyblock); } return rc; |