aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/component-factory.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a2b7b754d6..f0362f2923 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2002-05-30 Jeffrey Stedfast <fejj@ximian.com>
+ * component-factory.c (store_disconnect): Protect against NULL
+ stores. Fixes bug #25456.
+
* mail-callbacks.c (view_msg): Oops, create a message-browser
window here, not a folder-browser-window window.
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 8f6a8b9565..07f39faca5 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -1382,8 +1382,10 @@ mail_lookup_storage (CamelStore *store)
static void
store_disconnect(CamelStore *store, void *event_data, void *data)
{
- camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
- camel_object_unref (CAMEL_OBJECT (store));
+ if (store) {
+ camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
+ camel_object_unref (CAMEL_OBJECT (store));
+ }
}
void