security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

sm: Lock kbx files also before a search.

Browse Source 
* sm/keydb.c (keydb_search): Lock files.
--

This is required for Windows to avoid update locks.  We use it also on
Unix so that the locking behaviour is more or less indentical.

GnuPG-bug-id: 4505
This commit is contained in:
Werner Koch 2021-03-02 19:03:00 +01:00
parent 2b9ae79ad8
commit 677245ba0e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sm/keydb.c
View File

@ -931,7 +931,7 @@ int
keydb_search (ctrl_t ctrl, KEYDB_HANDLE hd, keydb_search (ctrl_t ctrl, KEYDB_HANDLE hd,
KEYDB_SEARCH_DESC *desc, size_t ndesc) KEYDB_SEARCH_DESC *desc, size_t ndesc)
{ {
int rc = -1; int rc;
unsigned long skipped; unsigned long skipped;
if (!hd) if (!hd)
@ -944,6 +944,11 @@ keydb_search (ctrl_t ctrl, KEYDB_HANDLE hd,
return gpg_error (GPG_ERR_NOT_FOUND); return gpg_error (GPG_ERR_NOT_FOUND);
} }
rc = keydb_lock (hd);
if (rc)
return rc;
rc = -1;
while (rc == -1 && hd->current >= 0 && hd->current < hd->used) while (rc == -1 && hd->current >= 0 && hd->current < hd->used)
{ {
switch (hd->active[hd->current].type) switch (hd->active[hd->current].type)