1 |
grobian 09/09/07 19:12:26 |
2 |
|
3 |
Added: mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch |
4 |
mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch |
5 |
mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch |
6 |
Log: |
7 |
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 |
8 |
(Portage version: 2.2.00.14200-prefix/cvs/Darwin powerpc) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch |
17 |
=================================================================== |
18 |
http://dev.mutt.org/trac/ticket/3314 |
19 |
http://dev.mutt.org/trac/changeset/053ef7bbaa72 |
20 |
|
21 |
Bail on missing pattern modifiers at end of pattern. Closes #3314. |
22 |
|
23 |
Index: pattern.c |
24 |
=================================================================== |
25 |
--- pattern.c (revision 5989:77ac8b5c2be6) |
26 |
+++ pattern.c (revision 6018:053ef7bbaa72) |
27 |
@@ -824,5 +824,11 @@ |
28 |
case '=': |
29 |
case '~': |
30 |
- if (*(ps.dptr + 1) == '(') |
31 |
+ if (!*(ps.dptr + 1)) |
32 |
+ { |
33 |
+ snprintf (err->data, err->dsize, _("missing pattern: %s"), ps.dptr); |
34 |
+ mutt_pattern_free (&curlist); |
35 |
+ return NULL; |
36 |
+ } |
37 |
+ if (*(ps.dptr + 1) == '(') |
38 |
{ |
39 |
ps.dptr ++; /* skip ~ */ |
40 |
|
41 |
|
42 |
|
43 |
1.1 mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch |
49 |
=================================================================== |
50 |
http://dev.mutt.org/trac/ticket/3315 |
51 |
http://dev.mutt.org/trac/changeset/6a08a5244d60 |
52 |
|
53 |
Clear last search pattern if it's invalid. Closes #3315. |
54 |
|
55 |
We keep both, the string version and compiled version around |
56 |
for search-next; however, in case of parsing errors we dropped |
57 |
only the compiled version and not the string one making the |
58 |
code attempting to perform a search using a NULL pattern. |
59 |
|
60 |
Index: pattern.c |
61 |
=================================================================== |
62 |
--- pattern.c (revision 6018:053ef7bbaa72) |
63 |
+++ pattern.c (revision 6019:6a08a5244d60) |
64 |
@@ -1437,6 +1437,7 @@ |
65 |
err.dsize = sizeof (error); |
66 |
if ((SearchPattern = mutt_pattern_comp (temp, M_FULL_MSG, &err)) == NULL) |
67 |
- { |
68 |
+ { |
69 |
mutt_error ("%s", error); |
70 |
+ LastSearch[0] = '\0'; |
71 |
return (-1); |
72 |
} |
73 |
|
74 |
|
75 |
|
76 |
1.1 mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch |
77 |
|
78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch |
82 |
=================================================================== |
83 |
http://dev.mutt.org/trac/ticket/3312 |
84 |
http://dev.mutt.org/trac/changeset/14bb498c6a1c |
85 |
|
86 |
Fix MH parsing, fixes [0698e8195545]. Closes #3312 |
87 |
|
88 |
Index: mh.c |
89 |
=================================================================== |
90 |
--- mh.c (revision 5999:2fc9348684fe) |
91 |
+++ mh.c (revision 6005:14bb498c6a1c) |
92 |
@@ -147,5 +147,5 @@ |
93 |
{ |
94 |
*p++ = '\0'; |
95 |
- if (mutt_atoi (t, first) < 0 || mutt_atoi (t, last) < 0) |
96 |
+ if (mutt_atoi (t, first) < 0 || mutt_atoi (p, last) < 0) |
97 |
return -1; |
98 |
} |