[git] GnuPG - branch, master, updated. gnupg-2.1.16-68-gdd03667

[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  dd03667ab1062bba3b9413c3f8007d63302d1b31 (commit)
       via  b265969154741bf9f93167699fe7ddda1d485265 (commit)
       via  c3008bffac68b6f31e9ae9bad837cdce5de7c0db (commit)
      from  dec2ae31a46a0f41886c7ad228865cc573f2dea9 (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 dd03667ab1062bba3b9413c3f8007d63302d1b31
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 8 13:04:06 2016 +0100

    tools: Fix use of uninitialized var in mime-maker.
    
    * tools/mime-maker.c (ensure_part): Make sure to set R_PARENT on
    error.
    (add_missing_headers): Ensure that ERR is set on success.
    
    * tools/wks-util.c (wks_parse_policy): Fix indentation.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/mime-maker.c b/tools/mime-maker.c
index ca05f1d..2e32069 100644
--- a/tools/mime-maker.c
+++ b/tools/mime-maker.c
@@ -251,7 +251,11 @@ ensure_part (mime_maker_t ctx, part_t *r_parent)
     {
       ctx->mail = xtrycalloc (1, sizeof *ctx->mail);
       if (!ctx->mail)
-        return gpg_error_from_syserror ();
+        {
+          if (r_parent)
+            *r_parent = NULL;
+          return gpg_error_from_syserror ();
+        }
       log_assert (!ctx->current_part);
       ctx->current_part = ctx->mail;
       ctx->current_part->headers_tail = &ctx->current_part->headers;
@@ -722,6 +726,7 @@ add_missing_headers (mime_maker_t ctx)
         goto leave;
     }
 
+  err = 0;
 
  leave:
   return err;
diff --git a/tools/wks-util.c b/tools/wks-util.c
index 183bdcd..1b47612 100644
--- a/tools/wks-util.c
+++ b/tools/wks-util.c
@@ -164,7 +164,8 @@ wks_parse_policy (policy_flags_t flags, estream_t stream, int ignore_unknown)
 
   if (!err && !es_feof (stream))
     err = gpg_error_from_syserror ();
-    leave:
+
+ leave:
   if (err)
     log_error ("error reading '%s', line %d: %s\n",
                es_fname_get (stream), lnr, gpg_strerror (err));

commit b265969154741bf9f93167699fe7ddda1d485265
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 8 13:02:37 2016 +0100

    tools: Fix memleak in gpgconf.
    
    * tools/gpgconf.c (main): Free SOCKETDIR.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 67a0dce..5f7912a 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -691,6 +691,7 @@ main (int argc, char **argv)
             if (gnupg_mkdir (socketdir, "-rwx"))
               gc_error (1, errno, "error creating '%s'", socketdir);
             /* Try again.  */
+            xfree (socketdir);
             socketdir = _gnupg_socketdir_internal (1, &flags);
           }
 

commit c3008bffac68b6f31e9ae9bad837cdce5de7c0db
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 8 13:06:10 2016 +0100

    gpg: Fix portability problem.
    
    * g10/tofu.c (build_conflict_set): Replace variable dynamic array.
    --
    
    Note that clang complained that CONFLICT_SET_COUNT could be negative.
    Thus I added an assert.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index 5b3e84c..d095bce 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2227,9 +2227,15 @@ build_conflict_set (tofu_dbs_t dbs,
     int j;
     strlist_t *prevp;
     strlist_t iter_next;
-    int die[conflict_set_count];
+    int *die;
 
-    memset (die, 0, sizeof (die));
+    log_assert (conflict_set_count > 0);
+    die = xtrycalloc (1, conflict_set_count);
+    if (!die)
+      {
+        /*err = gpg_error_from_syserror ();*/
+        xoutofcore (); /* Fixme: Let the fucntion return an error.  */
+      }
 
     for (i = 0; i < conflict_set_count; i ++)
       {
@@ -2269,6 +2275,7 @@ build_conflict_set (tofu_dbs_t dbs,
     /* We shouldn't have removed the head.  */
     log_assert (conflict_set);
     log_assert (conflict_set_count >= 1);
+    xfree (die);
   }
   xfree (kb_all);
 

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

Summary of changes:
 g10/tofu.c         | 11 +++++++++--
 tools/gpgconf.c    |  1 +
 tools/mime-maker.c |  7 ++++++-
 tools/wks-util.c   |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)


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