[git] GnuPG - branch, master, updated. gnupg-2.1.16-70-ga2bedc8

[by Justus Winter]

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  a2bedc8ac6fcdcd1de0a9fa3d540006481387dff (commit)
       via  3b5b94ceab7c0ed9501c5cf54b4efa17fcd7300a (commit)
      from  dd03667ab1062bba3b9413c3f8007d63302d1b31 (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 a2bedc8ac6fcdcd1de0a9fa3d540006481387dff
Author: Justus Winter <justus at g10code.com>
Date:   Thu Dec 8 15:39:05 2016 +0100

    gpgscm: Generalize 'for-each-p'.
    
    * tests/gpgscm/tests.scm (for-each-p): Generalize to N lists like
    for-each.
    (for-each-p'): Likewise.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index e2b38f5..bd51819 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -77,17 +77,18 @@
 	(flush-stdio)))
   (set! *progress-nesting* (- *progress-nesting* 1)))
 
-(define (for-each-p msg proc lst)
-  (for-each-p' msg proc (lambda (x) x) lst))
+(define (for-each-p msg proc lst . lsts)
+  (apply for-each-p' `(,msg ,proc ,(lambda (x . xs) x) ,lst , at lsts)))
 
-(define (for-each-p' msg proc fmt lst)
+(define (for-each-p' msg proc fmt lst . lsts)
   (call-with-progress
    msg
    (lambda (progress)
-     (for-each (lambda (a)
-		 (progress (fmt a))
-		 (proc a))
-	       lst))))
+     (apply for-each
+	    `(,(lambda args
+		 (progress (apply fmt args))
+		 (apply proc args))
+	      ,lst , at lsts)))))
 
 ;; Process management.
 (define CLOSED_FD -1)

commit 3b5b94ceab7c0ed9501c5cf54b4efa17fcd7300a
Author: Justus Winter <justus at g10code.com>
Date:   Thu Dec 8 14:17:50 2016 +0100

    g10: Fix out-of-bounds access.
    
    * g10/tofu.c (build_conflict_set): Use 'char'.
    
    Fixes-commit: c3008bffac68b6f31e9ae9bad837cdce5de7c0db
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index d095bce..abf1ab4 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2227,7 +2227,7 @@ build_conflict_set (tofu_dbs_t dbs,
     int j;
     strlist_t *prevp;
     strlist_t iter_next;
-    int *die;
+    char *die;
 
     log_assert (conflict_set_count > 0);
     die = xtrycalloc (1, conflict_set_count);

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

Summary of changes:
 g10/tofu.c             |  2 +-
 tests/gpgscm/tests.scm | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)


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