From 25036ec6abbc0c9d0003dcfe227724038c35a304 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 14 May 2014 16:32:49 +0200 Subject: 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. --- sm/keydb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sm') 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 */ -- cgit v1.2.3