X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=5eab9db5043539e621e2f81ee326fb177c6e5802;hp=18fac2b1aabd066a1a7a7bc9373860b1fb3dd2be;hb=73f7668b25b19be237399aaf2343fb7d432702a6;hpb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b

diff --git a/alias.c b/alias.c
index 18fac2b..5eab9db 100644
--- a/alias.c
+++ b/alias.c
@@ -160,7 +160,8 @@ static int alias_sanitize(const char *s, char *d)
         s++;
     }
 
-    *d = '\0';
+    if (d)
+        *d = '\0';
     return rv;
 }
 
@@ -513,10 +514,11 @@ alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
   return src;
 }
 
-static void alias_entry (char *s, ssize_t slen, MUTTMENU *m, int num)
+static void alias_entry(char *s, ssize_t slen, MUTTMENU *m, int num)
 {
-  m_strformat(s, slen, AliasFmt, alias_format_str, ((alias_t **)m->data)[num],
-              option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    m_strformat(s, slen, COLS - SW, AliasFmt, alias_format_str,
+                ((alias_t **)m->data)[num],
+                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static int alias_tag (MUTTMENU * menu, int n, int m)