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 fe06ea74d63b9f9bcadeea65c49cbffba760c26f..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;
      }
        rc = 1;
        break;
      }

-@@ -337,6 +343,32 @@
+@@ -337,6 +343,34 @@

  
    closedir (dirp);
  
  
    closedir (dirp);
  


@@ -82,11 +82,13 @@ in the "mutt-patched" package.
 +        mailbox->msgcount++;
 +    }
 +  }
 +        mailbox->msgcount++;
 +    }
 +  }

++
++  closedir (dirp);

 +
    return rc;
  }
  
 +
    return rc;
  }
  

-@@ -345,14 +377,33 @@
+@@ -345,14 +379,33 @@

  {
    int rc = 0;
    int statcheck;
  {
    int rc = 0;
    int statcheck;


@@ -121,7 +123,7 @@ in the "mutt-patched" package.
      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
      {
        rc = 1;
      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
      {
        rc = 1;

-@@ -374,9 +425,11 @@
+@@ -374,9 +427,11 @@

  int mutt_buffy_check (int force)
  {
    BUFFY *tmp;
  int mutt_buffy_check (int force)
  {
    BUFFY *tmp;


@@ -133,7 +135,7 @@ in the "mutt-patched" package.
  
    sb.st_size=0;
    contex_sb.st_dev=0;
  
    sb.st_size=0;
    contex_sb.st_dev=0;

-@@ -456,6 +509,20 @@
+@@ -456,6 +511,20 @@

        case M_MH:
        if ((tmp->new = mh_buffy (tmp->path)) > 0)
          BuffyCount++;
        case M_MH:
        if ((tmp->new = mh_buffy (tmp->path)) > 0)
          BuffyCount++;


@@ -1304,7 +1306,7 @@ in the "mutt-patched" package.
  # Name: crypt_autosign
 --- a/imap/imap.c
 +++ b/imap/imap.c
  # 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),
  
      imap_munge_mbox_name (munged, sizeof (munged), name);
      snprintf (command, sizeof (command),