diff options
| author | Werner Koch <wk@gnupg.org> | 2016-12-08 13:04:06 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-12-08 13:08:02 +0100 |
| commit | dd03667ab1062bba3b9413c3f8007d63302d1b31 (patch) | |
| tree | f2eddce56adede16d23f675501b0dc521d4288c0 | |
| parent | tools: Fix memleak in gpgconf. (diff) | |
| download | gnupg2-dd03667ab1062bba3b9413c3f8007d63302d1b31.tar.xz gnupg2-dd03667ab1062bba3b9413c3f8007d63302d1b31.zip | |
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@gnupg.org>
| -rw-r--r-- | tools/mime-maker.c | 7 | ||||
| -rw-r--r-- | 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 ca05f1d40..2e3206964 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 183bdcd68..1b47612bd 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)); |