Changeset 2317

Timestamp:

06/29/07 15:22:34

Author:

pvanhoof

Message:

Bugfix in previous commit. Unescaping characters like %20

Files:

• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (5 diffs)

trunk/libtinymail-camel/tny-camel-store-account.c

@@ -21 +21 @@
-#include <glib/gi18n-lib.h>
-#include <glib.h>
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
-#include <string.h>
-
@@ -1245 +1250 @@
-}
-
+
+static int
+hex_to_int (gchar c)
+{
+        return  c >= '0' && c <= '9' ? c - '0'
+                : c >= 'A' && c <= 'F' ? c - 'A' + 10
+                : c >= 'a' && c <= 'f' ? c - 'a' + 10
+                : -1;
+}
+
+static int
+unescape_character (const char *scanner)
+{
+        int first_digit;
+        int second_digit;
+
+        first_digit = hex_to_int (*scanner++);
+        if (first_digit < 0) {
+                return -1;
+        }
+
+        second_digit = hex_to_int (*scanner++);
+        if (second_digit < 0) {
+                return -1;
+        }
+
+        return (first_digit << 4) | second_digit;
+}
+
+
+static char *
+unescape_string (const gchar *escaped_string,
+                const gchar *illegal_characters)
+{
+        const gchar *in;
+        gchar *out, *result;
+        gint character;
+
+        if (escaped_string == NULL) {
+                return NULL;
+        }
+
+        result = g_malloc (strlen (escaped_string) + 1);
+
+        out = result;
+        for (in = escaped_string; *in != '\0'; in++) {
+                character = *in;
+                if (*in == '%') {
+                        character = unescape_character (in + 1);
+
+                        /* Check for an illegal character. We consider '\0' illegal here. */
+                        if (character <= 0
+                            || (illegal_characters != NULL
+                                && strchr (illegal_characters, (char)character) != NULL)) {
+                                g_free (result);
+                                return NULL;
+                        }
+                        in += 2;
+                }
+                *out++ = (char)character;
+        }
+
+        *out = '\0';
+        g_assert (out - result <= strlen (escaped_string));
+        return result;
+
+}
+
-static TnyFolder*
-tny_camel_store_account_find_folder_default (TnyStoreAccount *self, const gchar *url_string, GError **err)
@@ -1252 +1325 @@
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;    
-        CamelFolderInfo *iter = NULL; guint32 flags; CamelStore *store;
-
+, *nnstr = NULL
-
-        g_assert (CAMEL_IS_SESSION (apriv->session));
@@ -1293 +1366 @@
-                flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                iter = camel_store_get_folder_info (store, str, flags, &ex);
+
+                if (nnstr)
+                        g_free (nnstr);
+
-        } else {
-                g_set_error (err, TNY_FOLDER_STORE_ERROR, 
@@ -1315 +1423 @@
-                        "Invalid URL string");
-                _tny_session_stop_operation (apriv->session);
+
+                if (nnstr)
+                        g_free (nnstr);
+
-                return NULL;
-        }