Changeset 5477:fb77465af534

Timestamp:

2008-08-18 01:20:40 (3 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Validate charset names for all charset options.
Validation is either done against mutt's table of IANA assigned names or local iconv
implementation (based on the assumption that iconv_open(charset,charset) fails if charset
is unknown to the implementation). Closes #1668.

Files:

• ChangeLog (modified) (1 diff)
• charset.c (modified) (1 diff)
• charset.h (modified) (1 diff)
• init.c (modified) (5 diffs)

ChangeLog

@@ +1 @@
+2008-08-15 11:53 -0700  Brendan Cully  <brendan@kublai.com>  (ff3fbb6a92a8)
+
+        * mutt_sasl.c: Fix type-punning warning in sasl_getprop usage
+
+2008-08-15 11:41 -0700  Brendan Cully  <brendan@kublai.com>  (622ef570a7e3)
+
+        * ChangeLog, parse.c: Fix a couple of compiler warnings introduced in
+        [00ce81d778bf]. Make the style of mutt_parse_references more
+        pleasing to me.
+
 2008-07-10 09:38 -0400  Aron Griffis  <agriffis@n01se.net>  (d3ee9644765f)
 

charset.c

@@ -630 +630 @@
   FREE (_fc);           /* __FREE_CHECKED__ */
 }
+
+int mutt_check_charset (const char *s, int strict)
+{
+  int i;
+  iconv_t cd;
+
+  if (mutt_is_utf8 (s))
+    return 0;
+
+  if (!strict)
+    for (i = 0; PreferredMIMENames[i].key; i++)
+    {
+      if (ascii_strcasecmp (PreferredMIMENames[i].key, s) == 0 ||
+          ascii_strcasecmp (PreferredMIMENames[i].pref, s) == 0)
+        return 0;
+    }
+
+  if ((cd = mutt_iconv_open (s, s, 0)) != (iconv_t)(-1))
+  {
+    iconv_close (cd);
+    return 0;
+  }
+
+  return -1;
+}

charset.h

@@ -57 +57 @@
 #define M_ICONV_HOOK_FROM 1     /* apply charset-hooks to fromcode */
 
+/* Check if given character set is valid (either officially assigned or
+ * known to local iconv implementation). If strict is non-zero, check
+ * against iconv only. Returns 0 if known and negative otherwise.
+ */
+int mutt_check_charset (const char *s, int strict);
+
 #endif /* _CHARSET_H */

init.c

@@ -1683 +1683 @@
     *p++ = '"';
   *p = 0;
+}
+
+static int check_charset (struct option_t *opt, const char *val)
+{
+  char *p, *q, *s = safe_strdup (val);
+  int rc = 0, strict = strcmp (opt->option, "send_charset") == 0;
+
+  for (p = strtok_r (s, ":", &q); p; p = strtok_r (NULL, ":", &q))
+  {
+    if (!*p)
+      continue;
+    if (mutt_check_charset (p, strict) < 0)
+    {
+      rc = -1;
+      break;
+    }
+  }
+
+  FREE(&s);
+  return rc;
 }
 
@@ -1878 +1898 @@
           myvar_del (myvar);
         }
-        else if (DTYPE (MuttVars[idx].type) == DT_ADDR)
-          rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
-        else
-          /* MuttVars[idx].data is already 'char**' (or some 'void**') or... 
-           * so cast to 'void*' is okay */
-          FREE ((void *) MuttVars[idx].data);           /* __FREE_CHECKED__ */
 
         mutt_extract_token (tmp, s, 0);
+
         if (myvar)
         {
@@ -1894 +1909 @@
         else if (DTYPE (MuttVars[idx].type) == DT_PATH)
         {
+          /* MuttVars[idx].data is already 'char**' (or some 'void**') or... 
+           * so cast to 'void*' is okay */
+          FREE ((void *) MuttVars[idx].data);           /* __FREE_CHECKED__ */
+
           strfcpy (scratch, tmp->data, sizeof (scratch));
           mutt_expand_path (scratch, sizeof (scratch));
@@ -1900 +1919 @@
         else if (DTYPE (MuttVars[idx].type) == DT_STR)
         {
+          if (strstr (MuttVars[idx].option, "charset") &&
+              check_charset (&MuttVars[idx], tmp->data) < 0)
+          {
+            snprintf (err->data, err->dsize, _("Invalid value for option %s: \"%s\""),
+                      MuttVars[idx].option, tmp->data);
+            return (-1);
+          }
+
+          FREE ((void *) MuttVars[idx].data);           /* __FREE_CHECKED__ */
           *((char **) MuttVars[idx].data) = safe_strdup (tmp->data);
           if (mutt_strcmp (MuttVars[idx].option, "charset") == 0)
@@ -1906 +1934 @@
         else
         {
+          rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
           *((ADDRESS **) MuttVars[idx].data) = rfc822_parse_adrlist (NULL, tmp->data);
         }