components/procmail/patches/06.CVE-2014-3618.patch
author John Beck <John.Beck@Oracle.COM>
Thu, 04 Sep 2014 13:24:25 -0700
branchs11u2-sru
changeset 3302 8af6d7683ad1
permissions -rw-r--r--
19564032 problem in UTILITY/PROCMAIL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3302
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch comes from upstream:
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
http://seclists.org/oss-sec/2014/q3/495
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
We presume it will be part of a future release of procmail.
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
--- procmail-3.22/src/formisc.c.~2~	2014-09-04 08:56:27.832599147 -0700
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
+++ procmail-3.22/src/formisc.c	2014-09-04 08:56:54.543558430 -0700
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
@@ -84,12 +84,11 @@
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
 	case '"':*target++=delim='"';start++;
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
       }
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
      ;{ int i;
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
-	do
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
+	while(*start)
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
 	   if((i= *target++= *start++)==delim)	 /* corresponding delimiter? */
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
 	      break;
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    17
 	   else if(i=='\\'&&*start)		    /* skip quoted character */
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    18
 	      *target++= *start++;
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    19
-	while(*start);						/* anything? */
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    20
       }
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    21
      hitspc=2;
8af6d7683ad1 19564032 problem in UTILITY/PROCMAIL
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    22
    }