From 46569e71bf56e060c4304f19c16531139070ac59 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Thu, 15 Mar 2018 16:02:21 +0000
Subject: [PATCH] fix crash with incomplete template

---
 main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index e17d9eb3f..9702b01f0 100644
--- a/main.c
+++ b/main.c
@@ -792,7 +792,13 @@ int main(int argc, char **argv, char **env)
         }
         context_hdr->content->length = st.st_size;
 
-        mutt_prepare_template(fin, NULL, msg, context_hdr, 0);
+        if (mutt_prepare_template(fin, NULL, msg, context_hdr, 0) < 0)
+        {
+          mutt_error(_("Cannot parse message template: %s"), draft_file);
+          mutt_env_free(&opts_env);
+          mutt_free_header(&context_hdr);
+          goto main_curses;
+        }
 
         /* Scan for neomutt header to set ResumeDraftFiles */
         struct ListNode *np, *tmp;
-- 
2.50.1