[git] GnuPG - branch, master, updated. gnupg-2.1.12-88-g35a3ce2

[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  35a3ce2acf78a95fecbccfd8db0560cca24232df (commit)
      from  b56aebe76657ce6efa9c6819d5a8c2a31c2bbbba (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 35a3ce2acf78a95fecbccfd8db0560cca24232df
Author: Niibe Yutaka <gniibe at fsij.org>
Date:   Wed Jun 15 08:41:56 2016 +0900

    g10: Fix another race condition for trustdb access.
    
    * g10/tdbio.c (create_version_record): Call create_hashtable to always
    make hashtable, together with the version record.
    (get_trusthashrec): Remove call to create_hashtable.
    
    --
    
    GnuPG-bug-id: 1675
    Thanks to Scott Moser for a reproducible script and patience.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/tdbio.c b/g10/tdbio.c
index a414709..e27788e 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -119,6 +119,7 @@ static int in_transaction;
 
 

 static void open_db (void);
+static void create_hashtable (TRUSTREC *vr, int type);
 
 
 

@@ -582,8 +583,13 @@ create_version_record (void)
   rec.rectype = RECTYPE_VER;
   rec.recnum = 0;
   rc = tdbio_write_record (&rec);
+
   if (!rc)
     tdbio_sync ();
+
+  if (!rc)
+    create_hashtable (&rec, 0);
+
   return rc;
 }
 
@@ -957,8 +963,6 @@ get_trusthashrec(void)
       if (rc)
         log_fatal (_("%s: error reading version record: %s\n"),
                    db_name, gpg_strerror (rc) );
-      if (!vr.r.ver.trusthashtbl)
-        create_hashtable (&vr, 0);
 
       trusthashtbl = vr.r.ver.trusthashtbl;
     }

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

Summary of changes:
 g10/tdbio.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


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