[git] GnuPG - branch, master, updated. gnupg-2.1.11-108-ge2c5781

[by Werner Koch]

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  e2c5781788f765815532410a77077ddbb72513e9 (commit)
      from  fc30c079a348436868968850dabf653b91f82419 (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 e2c5781788f765815532410a77077ddbb72513e9
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 29 13:30:19 2016 +0200

    gpg: Fix NULL-segv for missing tofu DB.
    
    * g10/tofu.c (opendb): Guard call to timeout function.
    --
    
    GnuPG-bug-id: 2294
    
    Fix not tested but is pretty obvious.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index 6a88172..baa2ac2 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -706,7 +706,8 @@ opendb (char *filename, enum db_type type)
 
   /* If a DB is locked wait up to 5 seconds for the lock to be cleared
      before failing.  */
-  sqlite3_busy_timeout (db, 5 * 1000);
+  if (db)
+    sqlite3_busy_timeout (db, 5 * 1000);
 
   if (filename_free)
     xfree (filename);

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

Summary of changes:
 g10/tofu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


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