diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-03-03 06:39:38 +0000 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-03-03 06:39:38 +0000 |
| commit | c96487bfac1b4a85a92b29de298d8e2dab73da58 (patch) | |
| tree | 3d276467fa5f85a6dd91452573665fb3710f9f28 | |
| parent | 1ee87559688dd06177ffa151569379a386f97ef6 (diff) | |
| download | evolution-data-server-c96487bfac1b4a85a92b29de298d8e2dab73da58.tar.gz | |
Do similar folder != NULL checking as for delete_folder before passing a
2003-03-03 Not Zed <NotZed@Ximian.com>
* camel-store.c (camel_store_unsubscribe_folder): Do similar
folder != NULL checking as for delete_folder before passing a NULL
to object_bag_remove.
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-store.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index b3409df56..c3fb16e43 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2003-03-03 Not Zed <NotZed@Ximian.com> + + * camel-store.c (camel_store_unsubscribe_folder): Do similar + folder != NULL checking as for delete_folder before passing a NULL + to object_bag_remove. + 2003-02-28 Jeffrey Stedfast <fejj@ximian.com> * camel-http-stream.c (http_connect): Here too. diff --git a/camel/camel-store.c b/camel/camel-store.c index 35adf8c6c..852851f51 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -1021,11 +1021,12 @@ camel_store_unsubscribe_folder (CamelStore *store, CS_CLASS (store)->unsubscribe_folder (store, folder_name, ex); - if (store->folders) - camel_object_bag_remove(store->folders, folder); + if (folder) { + if (store->folders) + camel_object_bag_remove(store->folders, folder); - if (folder) camel_object_unref(folder); + } CAMEL_STORE_UNLOCK(store, folder_lock); } |