Bump, three more regression patches fixing a block when opening an MH folder, a segfault on certain search patterns and a segfault after 'next' when the previous search pattern was invalid

(Portage version: 2.2.00.14200-prefix/cvs/Darwin powerpc)

3 files changed, 61 insertions, 0 deletions

diff --git a/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch b/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
new file mode 100644
index 000000000000..b0a390f2f262
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
@@ -0,0 +1,16 @@
+http://dev.mutt.org/trac/ticket/3312
+http://dev.mutt.org/trac/changeset/14bb498c6a1c
+
+Fix MH parsing, fixes [0698e8195545]. Closes #3312
+
+Index: mh.c
+===================================================================
+--- mh.c (revision 5999:2fc9348684fe)
++++ mh.c (revision 6005:14bb498c6a1c)
+@@ -147,5 +147,5 @@
+   {
+     *p++ = '\0';
+-    if (mutt_atoi (t, first) < 0 || mutt_atoi (t, last) < 0)
++    if (mutt_atoi (t, first) < 0 || mutt_atoi (p, last) < 0)
+       return -1;
+   }
diff --git a/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch b/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
new file mode 100644
index 000000000000..18b84a59b535
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
@@ -0,0 +1,23 @@
+http://dev.mutt.org/trac/ticket/3315
+http://dev.mutt.org/trac/changeset/6a08a5244d60
+
+Clear last search pattern if it's invalid. Closes #3315.
+
+We keep both, the string version and compiled version around
+for search-next; however, in case of parsing errors we dropped
+only the compiled version and not the string one making the
+code attempting to perform a search using a NULL pattern.
+
+Index: pattern.c
+===================================================================
+--- pattern.c (revision 6018:053ef7bbaa72)
++++ pattern.c (revision 6019:6a08a5244d60)
+@@ -1437,6 +1437,7 @@
+       err.dsize = sizeof (error);
+       if ((SearchPattern = mutt_pattern_comp (temp, M_FULL_MSG, &err)) == NULL)
+-       {
++      {
+ 	mutt_error ("%s", error);
++	LastSearch[0] = '\0';
+ 	return (-1);
+       }
diff --git a/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch b/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
new file mode 100644
index 000000000000..df8d99e8fb6a
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
@@ -0,0 +1,22 @@
+http://dev.mutt.org/trac/ticket/3314
+http://dev.mutt.org/trac/changeset/053ef7bbaa72
+
+Bail on missing pattern modifiers at end of pattern. Closes #3314.
+
+Index: pattern.c
+===================================================================
+--- pattern.c (revision 5989:77ac8b5c2be6)
++++ pattern.c (revision 6018:053ef7bbaa72)
+@@ -824,5 +824,11 @@
+       case '=':
+       case '~':
+-	if (*(ps.dptr + 1) == '(') 
++	if (!*(ps.dptr + 1))
++	{
++	  snprintf (err->data, err->dsize, _("missing pattern: %s"), ps.dptr);
++	  mutt_pattern_free (&curlist);
++	  return NULL;
++	}
++	if (*(ps.dptr + 1) == '(')
+         {
+ 	  ps.dptr ++; /* skip ~ */