debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: fix use of uninitialized variable in "notmuch reply"

Browse source 
notmuch_show_params_t params is only initialized partially in
notmuch_reply_command(). The only field that is used uninitialized is
params.decrypt. It is usually non-zero, making "notmuch reply" on encrypted
messages work by coincidence.

Initialize params properly, and set params.decrypt as needed.

Signed-off-by: Jani Nikula <jani@nikula.org>
This commit is contained in:
Jani Nikula 2012-01-05 22:25:12 +02:00 committed by David Bremner
parent e0991930c0
commit 80ae1829c1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
notmuch-reply.c
View file

@ -622,11 +622,9 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
char *opt, *query_string; char *opt, *query_string;
int i, ret = 0; int i, ret = 0;
int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params); int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params);
notmuch_show_params_t params; notmuch_show_params_t params = { .part = -1 };
reply_format_func = notmuch_reply_format_default; reply_format_func = notmuch_reply_format_default;
params.part = -1;
params.cryptoctx = NULL;
argc--; argv++; /* skip subcommand argument */ argc--; argv++; /* skip subcommand argument */
@ -648,10 +646,12 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
} else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { } else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
if (params.cryptoctx == NULL) { if (params.cryptoctx == NULL) {
GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL); GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL);
if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg"))) if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg"))) {
fprintf (stderr, "Failed to construct gpg context.\n"); fprintf (stderr, "Failed to construct gpg context.\n");
else } else {
params.decrypt = TRUE;
g_mime_gpg_context_set_always_trust((GMimeGpgContext*)params.cryptoctx, FALSE); g_mime_gpg_context_set_always_trust((GMimeGpgContext*)params.cryptoctx, FALSE);
}
g_object_unref (session); g_object_unref (session);
session = NULL; session = NULL;
} }