cli: fix use of uninitialized variable in "notmuch reply"
authorJani Nikula <jani@nikula.org>
Thu, 5 Jan 2012 20:25:12 +0000 (22:25 +0200)
committerDavid Bremner <bremner@debian.org>
Mon, 9 Jan 2012 10:50:20 +0000 (06:50 -0400)
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>
notmuch-reply.c

index 7ac879f94419aa4d7783a0cb6d0be8912baad79b..7242310a7ec5f376872ac065044cbfc0e7c1fedb 100644 (file)
@@ -622,11 +622,9 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     char *opt, *query_string;
     int i, ret = 0;
     int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params);
     char *opt, *query_string;
     int i, ret = 0;
     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)) {
            if (params.cryptoctx == NULL) {
                GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL);
        } else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
            if (params.cryptoctx == 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);
                session = NULL;
            }
                g_object_unref (session);
                session = NULL;
            }