projects
/
modest
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1d06c0f
)
Check some error conditions in modest_tny_folder_find_folder_from_uri (fix 2 for...
author
Jose Dapena Paz
<jdapena@igalia.com>
Mon, 20 Jul 2009 08:54:32 +0000
(10:54 +0200)
committer
Jose Dapena Paz
<jdapena@igalia.com>
Mon, 20 Jul 2009 10:20:54 +0000
(12:20 +0200)
src/modest-tny-folder.c
patch
|
blob
|
history
diff --git
a/src/modest-tny-folder.c
b/src/modest-tny-folder.c
index
2c0442f
..
8e39657
100644
(file)
--- 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;
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);
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);
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));
TnyFolderStore *child;
child = TNY_FOLDER_STORE (tny_iterator_get_current (iterator));
+ if (!child)
+ continue;
if (TNY_IS_FOLDER (child)) {
gchar *folder_url;
if (TNY_IS_FOLDER (child)) {
gchar *folder_url;