diff options
| author | Werner Koch <[email protected]> | 2014-05-14 14:32:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-05-14 16:13:11 +0000 |
| commit | 25036ec6abbc0c9d0003dcfe227724038c35a304 (patch) | |
| tree | 2628b702861e55fc78e765c531c68594fd2d4e66 /sm/keydb.c | |
| parent | w32: Make make_absfilename work with drive letters. (diff) | |
| download | gnupg-25036ec6abbc0c9d0003dcfe227724038c35a304.tar.gz gnupg-25036ec6abbc0c9d0003dcfe227724038c35a304.zip | |
gpg: Fix uninitialized access to search descindex with gpg keyboxes.
* kbx/keybox-search.c (keybox_search): Add arg R_DESCINDEX. Chnage
both callers.
* g10/keydb.c (keydb_search): Always set DESCINDEX.
--
This only affects the new keybox for OpenPGP keys in 2.1. The bug
exhibited itself by running GPA's backup command on Windows.
Diffstat (limited to 'sm/keydb.c')
| -rw-r--r-- | sm/keydb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sm/keydb.c b/sm/keydb.c index de9c95cb5..845ebba88 100644 --- a/sm/keydb.c +++ b/sm/keydb.c @@ -798,7 +798,7 @@ keydb_search (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc) BUG(); /* we should never see it here */ break; case KEYDB_RESOURCE_TYPE_KEYBOX: - rc = keybox_search (hd->active[hd->current].u.kr, desc, ndesc); + rc = keybox_search (hd->active[hd->current].u.kr, desc, ndesc, NULL); break; } if (rc == -1) /* EOF -> switch to next resource */ |