From 524e7176af2ae82d32028ed0daaaa995ae8f9d87 Mon Sep 17 00:00:00 2001 From: Honza HorĂ¡k Date: Jun 25 2012 12:48:22 +0000 Subject: - Fix unhandled strchr output (rhbz#833044) --- diff --git a/mutt-1.5.21-writehead.patch b/mutt-1.5.21-writehead.patch new file mode 100644 index 0000000..4c10170 --- /dev/null +++ b/mutt-1.5.21-writehead.patch @@ -0,0 +1,12 @@ +diff -up mutt-1.5.21/sendlib.c.writehead mutt-1.5.21/sendlib.c +--- mutt-1.5.21/sendlib.c.writehead 2012-06-25 14:41:34.681483226 +0200 ++++ mutt-1.5.21/sendlib.c 2012-06-25 14:41:44.485408610 +0200 +@@ -1799,7 +1799,7 @@ static int write_one_header (FILE *fp, i + else + { + t = strchr (start, ':'); +- if (t > end) ++ if (t == NULL || t > end) + { + dprint (1, (debugfile, "mwoh: warning: header not in " + "'key: value' format!\n")); diff --git a/mutt.spec b/mutt.spec index 942dab4..dea10f5 100644 --- a/mutt.spec +++ b/mutt.spec @@ -36,6 +36,7 @@ Patch10: mutt-1.5.21-pophash.patch Patch11: mutt-1.5.21-certscomp.patch Patch12: mutt-1.5.21-notation.patch Patch13: mutt-1.5.21-syncdebug.patch +Patch14: mutt-1.5.21-writehead.patch Url: http://www.mutt.org/ Requires: mailcap urlview BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -84,6 +85,7 @@ for selecting groups of messages. %patch11 -p1 -b .certscomp %patch12 -p1 -b .notation %patch13 -p1 -b .syncdebug +%patch14 -p1 -b .writehead sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure @@ -169,6 +171,8 @@ rm -rf $RPM_BUILD_ROOT * Thu May 10 2012 Honza Horak - 5:1.5.21-12 - Fix segmentation fault while syncing mailbox (rhbz#691719) +- Fix unhandled strchr output + (rhbz#833044) * Wed Apr 25 2012 Honza Horak - 5:1.5.21-11 - Patch from Petr Pisar fixing verification of PGP signatures