- If the name of the folder returned by an IMAP server is empty, Mutt

  could segfault in the browser window attempting to display it.
- add_folder in browser.c looks like it got corrupted in some CVS
  update. A small patch makes things work again for
  examine_mailboxes.
(From: Brendan Cully <brendan@kublai.com>)

diff --git a/browser.c b/browser.c
index d170770d0cdd4b1c84bf07e5cc0539f027ecabc1..f08f99eac0625f16622cb7a70fedf319fe59f94c 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -170,7 +170,7 @@ folder_format_str (char *dest, size_t destlen, char op, const char *src,
     case 'f':
 #ifdef USE_IMAP
       if (mx_is_imap (folder->ff->name))
-        strfcpy (fn, folder->ff->desc, sizeof (fn));
+        strfcpy (fn, NONULL(folder->ff->desc), sizeof (fn));
       else
 #endif
       strfcpy (fn, folder->ff->name, sizeof(fn));
@@ -302,8 +302,6 @@ folder_format_str (char *dest, size_t destlen, char op, const char *src,
 static void add_folder (MUTTMENU *m, struct browser_state *state,
                        const char *name, const struct stat *s, int new)
 {
-  char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
   if (state->entrylen == state->entrymax)
   {
     /* need to allocate more space */
@@ -325,7 +323,7 @@ static void add_folder (MUTTMENU *m, struct browser_state *state,
 
   (state->entry)[state->entrylen].is_new = new;
   (state->entry)[state->entrylen].name = safe_strdup (name);
-  (state->entry)[state->entrylen].desc = safe_strdup (buffer);
+  (state->entry)[state->entrylen].desc = safe_strdup (name);
 #ifdef USE_IMAP
   (state->entry)[state->entrylen].notfolder = 0;
 #endif