From: Sergio Villar Senin <svillar@igalia.com>
Date: Wed, 12 Aug 2009 10:42:27 +0000 (+0200)
Subject: Use the escaped string to perform checks when creating temp streams
X-Git-Tag: 3.0.17-rc32~2
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=afdf05d88452fb8979abfbfa3813f26212feffe0

Use the escaped string to perform checks when creating temp streams
---

diff --git a/src/modest-utils.c b/src/modest-utils.c
index b050d0a..8df81af 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -134,13 +134,17 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 	/* hmmm... maybe we need a modest_text_utils_validate_file_name? */
 	g_return_val_if_fail (orig_name && strlen(orig_name) != 0, NULL);
 
-	if (strlen(orig_name) > 200) {
+	tmp = g_uri_escape_string (orig_name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT, FALSE);
+
+	if (strlen(tmp) > 200) {
+		g_free (tmp);
 		g_warning ("%s: filename too long ('%s')",
 			   __FUNCTION__, orig_name);
 		return NULL;
 	}
 
-	if (g_strstr_len (orig_name, strlen(orig_name), "/") != NULL) {
+	if (g_strstr_len (tmp, strlen (tmp), "/") != NULL) {
+		g_free (tmp);
 		g_warning ("%s: filename contains '/' character(s) (%s)",
 			   __FUNCTION__, orig_name);
 		return NULL;
@@ -160,7 +164,6 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 		return NULL;
 	}
 
-	tmp = g_uri_escape_string (orig_name, NULL, FALSE);
 	filepath = g_build_filename (tmpdir, tmp, NULL);
 	g_free (tmp);