From 6b42fb559204cdd7eb85f4886e38c7e61e6445c7 Mon Sep 17 00:00:00 2001 From: Veerapuram Varadhan Date: Mon, 3 Sep 2007 07:44:42 +0000 Subject: [PATCH] Fix for a crash when started in calendar mode svn path=/trunk/; revision=8031 --- servers/exchange/ChangeLog | 7 +++++++ servers/exchange/storage/exchange-hierarchy-webdav.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/servers/exchange/ChangeLog b/servers/exchange/ChangeLog index cbbe80c..74f333c 100644 --- a/servers/exchange/ChangeLog +++ b/servers/exchange/ChangeLog @@ -1,5 +1,12 @@ 2007-09-03 Veerapuram Varadhan + * storage/exchange-hierarchy-webdav.c: Check for validity of + deleted_items_uri before using it. Fixes a crash that happens + when started in calendar mode. Have seen some BGO traces showing + it - but do not have the bug-id atm. Will close them later. + +2007-09-03 Veerapuram Varadhan + ** Fixes #290330 (bnc) * storage/exchange-hierarchy-webdav.c: Fetch FOLDER_CLASS and PERMANENT_URL properties for public folders as well. diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.c b/servers/exchange/storage/exchange-hierarchy-webdav.c index 56f17a7..c9b37bf 100644 --- a/servers/exchange/storage/exchange-hierarchy-webdav.c +++ b/servers/exchange/storage/exchange-hierarchy-webdav.c @@ -790,7 +790,7 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *parent, int mode) subtrees = g_slist_remove (subtrees, folder); /* Dont scan the subtree for deleteditems folder */ int_uri = e_folder_exchange_get_internal_uri (folder); - if (int_uri && !strcmp (int_uri, deleted_items_uri)) + if (int_uri && deleted_items_uri && !strcmp (int_uri, deleted_items_uri)) continue; scan_subtree (hier, folder, mode); } -- 2.7.4