From: Richard Russon <rich@flatcap.org>
Date: Thu, 19 Sep 2019 20:07:23 +0000 (+0100)
Subject: fix pointer checks in generate_body()
X-Git-Tag: 2019-10-25~36^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56d012244943f283d0ae71b612be055696649d2b;p=neomutt

fix pointer checks in generate_body()
---

diff --git a/send.c b/send.c
index 9d8c9458b..95b35a4ae 100644
--- a/send.c
+++ b/send.c
@@ -1097,7 +1097,9 @@ static int generate_body(FILE *fp_tmp, struct Email *e, SendFlags flags,
     if (ans == MUTT_YES)
     {
       mutt_message(_("Including quoted message..."));
-      if (!single)
+      if (single && en)
+        include_reply(m, en->email, fp_tmp);
+      else
       {
         STAILQ_FOREACH(en, el, entries)
         {
@@ -1109,8 +1111,6 @@ static int generate_body(FILE *fp_tmp, struct Email *e, SendFlags flags,
           fputc('\n', fp_tmp);
         }
       }
-      else
-        include_reply(m, en->email, fp_tmp);
     }
   }
   else if (flags & SEND_FORWARD)
@@ -1126,7 +1126,7 @@ static int generate_body(FILE *fp_tmp, struct Email *e, SendFlags flags,
       while (last && last->next)
         last = last->next;
 
-      if (single)
+      if (single && en)
       {
         tmp = mutt_make_message_attach(m, en->email, false);
         if (last)
@@ -1152,7 +1152,7 @@ static int generate_body(FILE *fp_tmp, struct Email *e, SendFlags flags,
         }
       }
     }
-    else if (ans != MUTT_ABORT)
+    else if ((ans != MUTT_ABORT) && en)
     {
       if (mutt_inline_forward(m, e, en->email, fp_tmp) != 0)
         return -1;