X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=8e396576ee04eb4c9e7b4139c0395471bcf91abb;hp=2c0442f4d227fd5c0deac13db4cc956dd72ee3e6;hb=aa4a7c963f9e82309d238fea09984cbea14c267f;hpb=1d06c0fb495e228ae35f9fe60661ad3e90107535

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 2c0442f..8e39657 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -538,11 +538,17 @@ modest_tny_folder_store_find_folder_from_uri (TnyFolderStore *folder_store, cons
 	gchar *uri_to_find, *slash;
 	gint uri_lenght;
 
+	if (uri == NULL)
+		return NULL;
+
+	slash = strrchr (uri, '/');
+	if (slash == NULL)
+		return NULL;
+
 	result = NULL;
 	children = TNY_LIST (tny_simple_list_new ());
 	tny_folder_store_get_folders (folder_store, children, NULL, FALSE, NULL);
 
-	slash = strrchr (uri, '/');
 	uri_lenght = slash - uri + 1;
 	uri_to_find = g_malloc0 (sizeof(char) * uri_lenght);
 	strncpy (uri_to_find, uri, uri_lenght);
@@ -554,6 +560,8 @@ modest_tny_folder_store_find_folder_from_uri (TnyFolderStore *folder_store, cons
 		TnyFolderStore *child;
 
 		child = TNY_FOLDER_STORE (tny_iterator_get_current (iterator));
+		if (!child) 
+			continue;
 
 		if (TNY_IS_FOLDER (child)) {
 			gchar *folder_url;