X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=a0eb9acd6b3f028a12761e570bc55d7b5fae81ef;hp=5a9c76adc5e13c4f77989a067d10d94b0f5a44a8;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/compose.c b/compose.c
index 5a9c76a..a0eb9ac 100644
--- a/compose.c
+++ b/compose.c
@@ -18,6 +18,7 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -479,7 +480,7 @@ static const char *compose_format_str (char *buf, size_t buflen, char op,
     break;
 
   case 'v':
-    strncpy (buf, mutt_make_version (0), buflen);
+    m_strcpy(buf, buflen, mutt_make_version (0));
     break;
 
   case 0:
@@ -709,7 +710,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       if (m_strcmp("builtin", Editor) != 0 &&
           (op == OP_COMPOSE_EDIT_HEADERS ||
            (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
-        const char *tag = NULL, *err = NULL;
+        const char *tag = NULL;
+        char *err = NULL;
 
         mutt_env_to_local (msg->env);
         mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,