X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-show.c;h=603992a612448c8892888580a4fae68f5aa123dc;hb=990ad976639e0c6d835177f94b5de60b01ea1ade;hp=dbb1efb97f5954438d6d274f8bc5b7fb9cfb68c9;hpb=12de016686351b78631546299ed35cced01f1e77;p=notmuch

diff --git a/notmuch-show.c b/notmuch-show.c
index dbb1efb9..603992a6 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -708,6 +708,9 @@ format_part_end_json (GMimeObject *part)
 static void
 format_part_content_raw (GMimeObject *part)
 {
+    if (! GMIME_IS_PART (part))
+	return;
+
     GMimeStream *stream_stdout;
     GMimeStream *stream_filter = NULL;
     GMimeDataWrapper *wrapper;
@@ -933,6 +936,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     params.cryptoctx = NULL;
     params.decrypt = 0;
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
 	if (strcmp (argv[i], "--") == 0) {
 	    i++;