Changeset 3713

Timestamp:

07/01/08 17:42:42

Author:

jdapena

Message:

* libtinymail-camel/camel-lite/camel/camel-mime-utils.c:

• • • • Parse properly broken rfc2047 recipient headers sent from
        

gmail imap.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-mime-utils.c (modified) (2 diffs)

trunk/ChangeLog

@@ -21 +21 @@
-        * libtinymail-camel/tny-camel-pop-store-account.c:
-        Manage properly the internal inbox reference to avoid leaking it.
+
+        * libtinymail-camel/camel-lite/camel/camel-mime-utils.c:
+        Parse properly broken rfc2047 recipient headers sent from gmail imap.
-
-2008-06-26  Philip Van Hoof <pvanhoof@gnome.org>

trunk/libtinymail-camel/camel-lite/camel/camel-mime-utils.c

@@ -2463 +2463 @@
-   */
-
+static void
+fix_broken_rfc2047 (const char **in)
+{
+        gchar *p, *broken_start, *r;
+        gboolean encoded = FALSE;
+        gboolean broken = TRUE;
+
+        p = *in;
+
+        while (*p != '\0') {
+                if (!encoded) {
+                        if (*p == '=' && *(p+1) == '?') {
+                                p++;
+                                encoded = TRUE;
+                                broken = FALSE;
+                        }
+                } else if (!broken) {
+                        if (*p == '<') {
+                                broken = TRUE;
+                                broken_start = p;
+                        } else if ((*p == '?') && (*(p+1) == '=')) {
+                                encoded = FALSE;
+                                p++;
+                        }
+                } else {
+                        if ((*p == '?') && (*(p+1) == '=')) {
+                                memmove (broken_start + 2, broken_start, p - broken_start);
+                                broken_start[0] = '?';
+                                broken_start[1] = '=';
+                                broken = FALSE;
+                                encoded = FALSE;
+                        }
+                }
+                p++;
+        }
+
+}
+
-static struct _camel_header_address *
-header_decode_mailbox(const char **in, const char *charset)
@@ -2475 +2513 @@
-
-        addr = g_string_new("");
+
+        if (strncmp (inptr, "=?", 2)==0) {
+                /* check if we've got a wrong string as gmail sends and fix it.*/
+                fix_broken_rfc2047 (in);
+        }
-
-        /* for each address */