Imported Upstream version 1.5.21

[software/mutt-debian.git] / rfc1524.c

diff --git a/rfc1524.c b/rfc1524.c
index bc709aef63b18bd69972c1ef07b595dfe5d1ff57..ff031de2fb165de0183ea903a169dfa8a1365540 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -68,9 +68,10 @@ int rfc1524_expand_command (BODY *a, char *filename, char *_type,
   if (option (OPTMAILCAPSANITIZE))
     mutt_sanitize_filename (type, 0);
 
   if (option (OPTMAILCAPSANITIZE))
     mutt_sanitize_filename (type, 0);
 

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

   {
   {

-    if (command[x] == '\\') {
+    if (command[x] == '\\')
+    {

       x++;
       buf[y++] = command[x++];
     }
       x++;
       buf[y++] = command[x++];
     }


@@ -85,7 +86,7 @@ int rfc1524_expand_command (BODY *a, char *filename, char *_type,
        int z = 0;
 
        x++;
        int z = 0;
 
        x++;

-       while (command[x] && command[x] != '}' && z<sizeof(param))
+       while (command[x] && command[x] != '}' && z < sizeof (param) - 1)

          param[z++] = command[x++];
        param[z] = '\0';
        
          param[z++] = command[x++];
        param[z] = '\0';
        


@@ -387,7 +388,7 @@ int rfc1524_mailcap_lookup (BODY *a, char *type, rfc1524_entry *entry, int opt)
   /* rfc1524 specifies that a path of mailcap files should be searched.
    * joy.  They say 
    * $HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap, etc
   /* rfc1524 specifies that a path of mailcap files should be searched.
    * joy.  They say 
    * $HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap, etc

-   * and overriden by the MAILCAPS environment variable, and, just to be nice, 
+   * and overridden by the MAILCAPS environment variable, and, just to be nice,

    * we'll make it specifiable in .muttrc
    */
   if (!curr || !*curr)
    * we'll make it specifiable in .muttrc
    */
   if (!curr || !*curr)