[git] GnuPG - branch, master, updated. gnupg-2.1.20-96-g116cfd6

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  116cfd60779fbb3540da629db54dc2e148f4a3a2 (commit)
      from  2e71bf30f038ca0e142acbb6f650ce029105f8a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 116cfd60779fbb3540da629db54dc2e148f4a3a2
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Apr 25 07:48:51 2017 +0900

    g10: invalidate the fd cache for keyring.
    
    * g10/keyring.c (keyring_search_reset): Don't keep the FD cache.
    
    --
    
    GnuPG-bug-id: 3096
    Fixes-commit: 5556eca5acd46983bff0b38a1ffbc2f07fbaba9f
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/keyring.c b/g10/keyring.c
index 51b7687..e223f0f 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -663,7 +663,6 @@ keyring_search_reset (KEYRING_HANDLE hd)
 {
     log_assert (hd);
 
-    hd->current.kr = NULL;
     iobuf_close (hd->current.iobuf);
     hd->current.iobuf = NULL;
     hd->current.eof = 0;
@@ -671,6 +670,12 @@ keyring_search_reset (KEYRING_HANDLE hd)
 
     hd->found.kr = NULL;
     hd->found.offset = 0;
+
+    if (hd->current.kr)
+      iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0,
+                   (char*)hd->current.kr->fname);
+    hd->current.kr = NULL;
+
     return 0;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 g10/keyring.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org