notmuch reply: Avoid segmentation fault when printing multiple parts

[notmuch] / show-message.c

diff --git a/show-message.c b/show-message.c
index 2d3189e33474b02e2e177827f4ab17b3459d24b3..2ec9eca91d5095b8dd6409a98b743bc314c02a6b 100644 (file)
--- a/show-message.c
+++ b/show-message.c
@@ -22,66 +22,84 @@
 
 #include "notmuch-client.h"
 
+typedef struct show_message_state {
+    int part_count;
+    int in_zone;
+} show_message_state_t;
+
 static void
-show_message_part (GMimeObject *part, int *part_count,
-                  void (*show_part) (GMimeObject *part, int *part_count))
+show_message_part (GMimeObject *part,
+                  show_message_state_t *state,
+                  const notmuch_show_format_t *format,
+                  notmuch_show_params_t *params,
+                  int first)
 {
-    *part_count = *part_count + 1;
+    int selected;
+    state->part_count += 1;
+
+    if (! (GMIME_IS_PART (part) || GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part))) {
+       fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
+                g_type_name (G_OBJECT_TYPE (part)));
+       return;
+    }
+
+    selected = (params->part <= 0 || state->part_count == params->part);
+
+    if (selected || state->in_zone) {
+       if (!first && (params->part <= 0 || state->in_zone) && format->part_sep)
+           fputs (format->part_sep, stdout);
+
+       format->part (part, &(state->part_count));
+    }
 
     if (GMIME_IS_MULTIPART (part)) {
        GMimeMultipart *multipart = GMIME_MULTIPART (part);
        int i;
 
+       if (selected)
+           state->in_zone = 1;
+
        for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
-           if (GMIME_IS_MULTIPART_SIGNED (multipart)) {
-               /* Don't index the signature. */
-               if (i == 1)
-                   continue;
-               if (i > 1)
-                   fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n");
-           }
            show_message_part (g_mime_multipart_get_part (multipart, i),
-                              part_count, show_part);
+                              state, format, params, i == 0);
        }
-       return;
-    }
 
-    if (GMIME_IS_MESSAGE_PART (part)) {
-       GMimeMessage *mime_message;
+       if (selected)
+           state->in_zone = 0;
 
-       mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+    } else if (GMIME_IS_MESSAGE_PART (part)) {
+       GMimeMessage *mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+
+       if (selected)
+           state->in_zone = 1;
 
        show_message_part (g_mime_message_get_mime_part (mime_message),
-                          part_count, show_part);
+                          state, format, params, TRUE);
 
-       return;
+       if (selected)
+           state->in_zone = 0;
     }
 
-    if (! (GMIME_IS_PART (part))) {
-       fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
-                g_type_name (G_OBJECT_TYPE (part)));
-       return;
+    if (selected || state->in_zone) {
+       if (format->part_end)
+           format->part_end (part);
     }
-
-    (*show_part) (part, part_count);
 }
 
 notmuch_status_t
 show_message_body (const char *filename,
-                  void (*show_part) (GMimeObject *part, int *part_count))
+                  const notmuch_show_format_t *format,
+                  notmuch_show_params_t *params)
 {
     GMimeStream *stream = NULL;
     GMimeParser *parser = NULL;
     GMimeMessage *mime_message = NULL;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
-    static int initialized = 0;
     FILE *file = NULL;
-    int part_count = 0;
+    show_message_state_t state;
 
-    if (! initialized) {
-       g_mime_init (0);
-       initialized = 1;
-    }
+    state.part_count = 0;
+    state.in_zone = 0;
 
     file = fopen (filename, "r");
     if (! file) {
@@ -98,7 +116,10 @@ show_message_body (const char *filename,
     mime_message = g_mime_parser_construct_message (parser);
 
     show_message_part (g_mime_message_get_mime_part (mime_message),
-                      &part_count, show_part);
+                      &state,
+                      format,
+                      params,
+                      TRUE);
 
   DONE:
     if (mime_message)