1 # These patches have been accepted upstream and should thus be removed upon

     2 # the next upgrade; details in the bug report.

     3 --- mutt-1.5.21/rfc1524.c.orig	Mon Mar  1 09:56:19 2010

     4 +++ mutt-1.5.21/rfc1524.c	Thu Feb 21 13:05:24 2013

     5 @@ -68,7 +68,7 @@

     6    if (option (OPTMAILCAPSANITIZE))

     7      mutt_sanitize_filename (type, 0);

     8  

     9 -  while (x < clen && command[x] && y < sizeof (buf) - 1)

    10 +  while (x < clen - 1 && command[x] && y < sizeof (buf) - 1)

    11    {

    12      if (command[x] == '\\')

    13      {

    14 --- mutt-1.5.21/sendlib.c.orig	Mon Sep 13 10:19:55 2010

    15 +++ mutt-1.5.21/sendlib.c	Thu Feb 21 13:27:42 2013

    16 @@ -1664,7 +1664,7 @@

    17      /* find the next word and place it in `buf'. it may start with

    18       * whitespace we can fold before */

    19      next = find_word (p);

    20 -    l = MIN(sizeof (buf), next - p);

    21 +    l = MIN(sizeof (buf) - 1, next - p);

    22      memcpy (buf, p, l);

    23      buf[l] = 0;

    24  

    25 --- mutt-1.5.21/smime.c.orig	Mon Sep 13 10:19:55 2010

    26 +++ mutt-1.5.21/smime.c	Fri Feb 22 04:17:00 2013

    27 @@ -357,7 +357,7 @@

    28    char index_file[_POSIX_PATH_MAX];

    29    FILE *index;

    30    char buf[LONG_STRING];

    31 -  char fields[5][STRING];

    32 +  char fields[5][STRING+1]; /* +1 due to use of fscanf() below. the max field width does not include the null terminator (see http://dev.mutt.org/trac/ticket/3636) */

    33    int numFields, hash_suffix, done, cur; /* The current entry */

    34    MUTTMENU* menu;

    35    unsigned int hash;

    36 @@ -470,7 +470,7 @@

    37    int addr_len, query_len, found = 0, ask = 0, choice = 0;

    38    char cert_path[_POSIX_PATH_MAX];

    39    char buf[LONG_STRING], prompt[STRING];

    40 -  char fields[5][STRING];

    41 +  char fields[5][STRING+1]; /* +1 due to use of fscanf() below. the max field width does not include the null terminator (see http://dev.mutt.org/trac/ticket/3636) */

    42    char key[STRING];  

    43    int numFields;

    44    struct stat info;