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

[notmuch] / show-message.c

diff --git a/show-message.c b/show-message.c
index c90f310ca3c45b77b412b2ded67239e9e566b4c8..d83f04ecc553264bd42b28867e5154c33966b4f2 100644 (file)
--- a/show-message.c
+++ b/show-message.c
@@ -34,6 +34,7 @@ show_message_part (GMimeObject *part,
                   notmuch_show_params_t *params,
                   int first)
 {
+    GMimeObject *decryptedpart = NULL;
     int selected;
     state->part_count += 1;
 
@@ -58,7 +59,32 @@ show_message_part (GMimeObject *part,
        GMimeMultipart *multipart = GMIME_MULTIPART (part);
        GError* err = NULL;
 
-       if (GMIME_IS_MULTIPART_SIGNED (part))
+       if (GMIME_IS_MULTIPART_ENCRYPTED (part) && params->decrypt)
+       {
+           if ( g_mime_multipart_get_count (multipart) != 2 ) {
+               /* this violates RFC 3156 section 4, so we won't bother with it. */
+               fprintf (stderr,
+                        "Error: %d part(s) for a multipart/encrypted message (should be exactly 2)\n",
+                        g_mime_multipart_get_count (multipart));
+           } else {
+               GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);
+               decryptedpart = g_mime_multipart_encrypted_decrypt (encrypteddata, params->cryptoctx, &err);
+               if (decryptedpart) {
+                   if ((selected || state->in_zone) && format->part_encstatus)
+                       format->part_encstatus (1);
+                   const GMimeSignatureValidity *sigvalidity = g_mime_multipart_encrypted_get_signature_validity (encrypteddata);
+                   if (!sigvalidity)
+                       fprintf (stderr, "Failed to verify signed part: %s\n", (err ? err->message : "no error explanation given"));
+                   if ((selected || state->in_zone) && format->part_sigstatus)
+                       format->part_sigstatus (sigvalidity);
+               } else {
+                   fprintf (stderr, "Failed to decrypt part: %s\n", (err ? err->message : "no error explanation given"));
+                   if ((selected || state->in_zone) && format->part_encstatus)
+                       format->part_encstatus (0);
+               }
+           }
+       }
+       else if (GMIME_IS_MULTIPART_SIGNED (part))
        {
            if ( g_mime_multipart_get_count (multipart) != 2 ) {
                /* this violates RFC 3156 section 5, so we won't bother with it. */
@@ -78,8 +104,6 @@ show_message_part (GMimeObject *part,
                }
                if ((selected || state->in_zone) && format->part_sigstatus)
                    format->part_sigstatus (sigvalidity);
-               /* extract only data part, and ignore signature part */
-               part = g_mime_multipart_get_part (multipart, 0);
                if (sigvalidity)
                    g_mime_signature_validity_free (sigvalidity);
            }
@@ -100,9 +124,20 @@ show_message_part (GMimeObject *part,
        if (selected)
            state->in_zone = 1;
 
-       for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
-           show_message_part (g_mime_multipart_get_part (multipart, i),
-                              state, format, params, i == 0);
+       if (decryptedpart) {
+           /* We emit the useless application/pgp-encrypted version
+            * part here only to keep the emitted output as consistent
+            * as possible between decrypted output and the
+            * unprocessed multipart/mime. For some strange reason,
+            * the actual encrypted data is the second part of the
+            * multipart. */
+           show_message_part (g_mime_multipart_get_part (multipart, 0), state, format, params, TRUE);
+           show_message_part (decryptedpart, state, format, params, FALSE);
+       } else {
+           for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
+               show_message_part (g_mime_multipart_get_part (multipart, i),
+                                  state, format, params, i == 0);
+           }
        }
 
        if (selected)
@@ -114,9 +149,21 @@ show_message_part (GMimeObject *part,
        if (selected)
            state->in_zone = 1;
 
+       if (selected || (!selected && state->in_zone)) {
+           fputs (format->header_start, stdout);
+           if (format->header_message_part)
+               format->header_message_part (mime_message);
+           fputs (format->header_end, stdout);
+
+           fputs (format->body_start, stdout);
+       }
+
        show_message_part (g_mime_message_get_mime_part (mime_message),
                           state, format, params, TRUE);
 
+       if (selected || (!selected && state->in_zone))
+           fputs (format->body_end, stdout);
+
        if (selected)
            state->in_zone = 0;
     }