upstream/537694-segv-imap-headers.patch: fixing a segfault when the IMAP server...

diff --git a/debian/changelog b/debian/changelog
index ff30f9f96dc281ab10fc44b449270d89c07dee5f..5cb85586d87e99118c936e43115b1d37f8c15ec3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mutt (1.5.20-5) unstable; urgency=low
   * debian/patches:
     + upstream/533370-pgp-inline.patch: fixing the patch from 1.5.20-3, now
       pgp.c is correctly included (Closes: 533370)
   * debian/patches:
     + upstream/533370-pgp-inline.patch: fixing the patch from 1.5.20-3, now
       pgp.c is correctly included (Closes: 533370)

+    + upstream/537694-segv-imap-headers.patch: fixing a segfault when the IMAP 
+      server sends additional headers and mutt segfaults (Closes: 537694)

 
  -- Antonio Radici <antonio@dyne.org>  Wed, 16 Sep 2009 22:31:22 +0100
 
 
  -- Antonio Radici <antonio@dyne.org>  Wed, 16 Sep 2009 22:31:22 +0100
 

diff --git a/debian/patches/upstream/537694-segv-imap-headers.patch b/debian/patches/upstream/537694-segv-imap-headers.patch
new file mode 100644 (file)
index 0000000..4c7f74c
--- /dev/null
+++ b/debian/patches/upstream/537694-segv-imap-headers.patch
@@ -0,0 +1,15 @@
+This patch fixes a segfault that happens when the IMAP server sends some
+additional flags for the same message ID, see upstream bug
+http://bugs.mutt.org/3288
+
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -288,7 +288,7 @@
+         continue;
+       }
+       /* May receive FLAGS updates in a separate untagged response (#2935) */
+-      if (idx < ctx->msgcount)
++      if (ctx->hdrs[idx] != NULL)
+       {
+       dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
+                   h.sid));