upstream/620854-pop3-segfault.patch: prevent segfault when $message_cachedir is set...

[software/mutt-debian.git] / debian / patches / mutt-patched / sidebar

diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index c207da7fd912051a50d863ad0858b4e4d4a1624a..c48148fc3e5d7b6f1a64a9c9ce7eeae799b4b17b 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -53,7 +53,7 @@ in the "mutt-patched" package.
        rc = 1;
        break;
      }
-@@ -337,6 +343,33 @@
+@@ -337,6 +343,34 @@
  
    closedir (dirp);
  
@@ -65,7 +65,6 @@ in the "mutt-patched" package.
 +  if ((dirp = opendir (path)) == NULL)
 +  {
 +    mailbox->magic = 0;
-+    break;
 +  }
 +  while ((de = readdir (dirp)) != NULL)
 +  {
@@ -83,11 +82,20 @@ in the "mutt-patched" package.
 +        mailbox->msgcount++;
 +    }
 +  }
++
++  closedir (dirp);
 +
    return rc;
  }
  
-@@ -351,8 +384,26 @@
+@@ -345,14 +379,33 @@
+ {
+   int rc = 0;
+   int statcheck;
++  CONTEXT *ctx;
+ 
+   if (option (OPTCHECKMBOXSIZE))
+     statcheck = sb->st_size > mailbox->size;
    else
      statcheck = sb->st_mtime > sb->st_atime
        || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
@@ -115,7 +123,11 @@ in the "mutt-patched" package.
      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
      {
        rc = 1;
-@@ -377,6 +428,7 @@
+@@ -374,9 +427,11 @@
+ int mutt_buffy_check (int force)
+ {
+   BUFFY *tmp;
++  struct dirent *de, *dp;
    struct stat sb;
    struct stat contex_sb;
    time_t t;
@@ -123,12 +135,12 @@ in the "mutt-patched" package.
  
    sb.st_size=0;
    contex_sb.st_dev=0;
-@@ -456,6 +508,20 @@
+@@ -456,6 +511,20 @@
        case M_MH:
        if ((tmp->new = mh_buffy (tmp->path)) > 0)
          BuffyCount++;
 +
-+  if ((dp = opendir (path)) == NULL)
++  if ((dp = opendir (tmp->path)) == NULL)
 +    break;
 +  tmp->msgcount = 0;
 +  while ((de = readdir (dp)))
@@ -140,7 +152,7 @@ in the "mutt-patched" package.
 +    }
 +  }
 +  closedir (dp);
-+      }
++
        break;
        }
      }
@@ -1294,7 +1306,7 @@ in the "mutt-patched" package.
  # Name: crypt_autosign
 --- a/imap/imap.c
 +++ b/imap/imap.c
-@@ -1521,7 +1521,7 @@
+@@ -1527,7 +1527,7 @@
  
      imap_munge_mbox_name (munged, sizeof (munged), name);
      snprintf (command, sizeof (command),