security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

kbx: Fix an endless loop under Windows due to an incomplete fix.

Browse Source 
* kbx/keybox-search.c (keybox_search):  We need to seek to the last
position in all cases not just when doing a NEXT.
--

This is because search from the beginning needs a keybox_search_reset.
We can only make an exception for KEYDB_SEARCH_MODE_FIRST..

Fixes-commit: 49b236af0ecbb6df67513feb4b63851f2e159ea2
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-05-16 13:57:04 +02:00
parent 50c2f76ae6
commit 6fc5df1e10
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kbx/keybox-search.c
View File

@ -932,9 +932,9 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc,
return rc; return rc;
} }
/* log_debug ("%s: re-opened file\n", __func__); */ /* log_debug ("%s: re-opened file\n", __func__); */
if (ndesc && desc[0].mode == KEYDB_SEARCH_MODE_NEXT && lastfoundoff) if (ndesc && desc[0].mode != KEYDB_SEARCH_MODE_FIRST && lastfoundoff)
{ {
/* Search mode is next and the last search operation /* Search mode is not first and the last search operation
* returned a blob which also was not the first one. We now * returned a blob which also was not the first one. We now
* need to skip over that blob and hope that the file has * need to skip over that blob and hope that the file has
* not changed. */ * not changed. */