[git] GnuPG - branch, master, updated. gnupg-2.1.4-20-g255dadd

[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  255dadd76d5a2101d2c5450741326b67253fa9ea (commit)
      from  abbefdd04d7ee30218506caeae1fd858569c9f0a (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 255dadd76d5a2101d2c5450741326b67253fa9ea
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 9 11:31:06 2015 +0200

    dirmngr: Avoid crash due to an empty crls.d/DIR.txt.
    
    * dirmngr/crlcache.c (check_dir_version): Avoid segv.
    --
    
    GnuPG-bug-id: 1842
    Debian-bug-id: 776611

diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index d10e3ca..d4c3dcb 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -479,7 +479,9 @@ check_dir_version (estream_t *fpadr, const char *fname,
   if (lineerr)
     return lineerr;
 
-  if (strtol (line+2, NULL, 10) != DBDIRVERSION)
+  /* The !line catches the case of an empty DIR file.  We handle this
+     the same as a non-matching version.  */
+  if (!line || strtol (line+2, NULL, 10) != DBDIRVERSION)
     {
       if (!created && cleanup_on_mismatch)
         {

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

Summary of changes:
 dirmngr/crlcache.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


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