upstream/578087-header-strchr.patch: prevent from segfaulting on malformed messages...

diff --git a/debian/changelog b/debian/changelog
index 36502cfad2e53a5c0889c5739864292c55828a0c..1af3264c66bd933091274433f610402f0daee2a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 mutt (1.5.21-2) UNRELEASED; urgency=low
 
+  [ Christoph Berg ]
   * debian/patches: features/imap_fast_trash: Support purging of messages.
 
- -- Christoph Berg <myon@debian.org>  Wed, 06 Oct 2010 14:13:53 +0200
+  [ Antonio Radici ]
+  * debian/patches:
+    + upstream/578087-header-strchr.patch: prevent from segfaulting on malformed
+      messages (Closes: 578087)
+
+ -- Antonio Radici <antonio@dyne.org>  Sat, 01 Jan 2011 12:56:29 +0000
 
 mutt (1.5.21-1) experimental; urgency=low
 

diff --git a/debian/patches/series b/debian/patches/series
index e6eedf90f64791d0d5ea5c1a6ded3cdf28538ce9..bd9a16998e7a792ddb6fd27146f7dc22e142fd82 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,6 +39,7 @@ upstream/547980-smime_keys-chaining.patch
 upstream/528233-readonly-open.patch
 upstream/228671-pipe-mime.patch
 upstream/383769-score-match.patch
+upstream/578087-header-strchr.patch
 
 upstream/path_max
 

diff --git a/debian/patches/upstream/578087-header-strchr.patch b/debian/patches/upstream/578087-header-strchr.patch
new file mode 100644 (file)
index 0000000..07d5903
--- /dev/null
+++ b/debian/patches/upstream/578087-header-strchr.patch
@@ -0,0 +1,14 @@
+This fixes a segfault that can happen on a malformed message; patch comes from
+upstream http://bugs.mutt.org/3483
+
+--- a/sendlib.c
++++ b/sendlib.c
+@@ -1799,7 +1799,7 @@
+   else
+   {
+     t = strchr (start, ':');
+-    if (t > end)
++    if (!t || t > end)
+     {
+       dprint (1, (debugfile, "mwoh: warning: header not in "
+                 "'key: value' format!\n"));