~ubuntu-dev/ubuntu/lucid/mutt/lucid-201002101854

« back to all changes in this revision

Viewing changes to debian/patches/upstream/537694-segv-imap-headers.patch

  • Committer: Bazaar Package Importer
  • Author(s): Antonio Radici
  • Date: 2009-12-02 22:38:00 UTC
  • mfrom: (2.3.2 squeeze)
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: james.westby@ubuntu.com-20091202223800-i337sucwecv25lfn
* debian/patches:
  + upstream/533370-pgp-inline.patch: fixing the patch from 1.5.20-3, now
    pgp.c is correctly included (Closes: 533370, 558813)
  + upstream/537694-segv-imap-headers.patch: fixing a segfault when the IMAP 
    server sends additional headers and mutt segfaults (Closes: 537694)
  + upstream/393926-internal-viewer.patch: revert the patch and add the
    auto_view of text/x-diff (Closes: 546760, 549158)
  + upstream/548577-gpgme-1.2.patch: do not fail to open pgp signed message
    with libgpgme >= 1.2 (Closes: 548577)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
This patch fixes a segfault that happens when the IMAP server sends some
 
2
additional flags for the same message ID, see upstream bug
 
3
http://bugs.mutt.org/3288
 
4
 
 
5
--- a/imap/message.c
 
6
+++ b/imap/message.c
 
7
@@ -288,7 +288,7 @@
 
8
         continue;
 
9
       }
 
10
       /* May receive FLAGS updates in a separate untagged response (#2935) */
 
11
-      if (idx < ctx->msgcount)
 
12
+      if (ctx->hdrs[idx] != NULL)
 
13
       {
 
14
        dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
 
15
                    h.sid));