[Pkg-gnupg-commit] [gnupg2] 68/180: tools: Fix use of uninitialized var in mime-maker.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

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>
---
 tools/mime-maker.c | 7 ++++++-
 tools/wks-util.c   | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

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));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git