From e7d495a63b0074461e738b33d949889d3d304d57 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 24 May 2002 05:15:31 +0000 Subject: Added some NULL protection fixes. 2002-05-24 Jeffrey Stedfast * providers/imap/camel-imap-store.c (connect_to_server): Added some NULL protection fixes. svn path=/trunk/; revision=16997 --- camel/ChangeLog | 5 +++++ camel/providers/imap/camel-imap-store.c | 29 +++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index b724629dc1..148c09e23c 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2002-05-24 Jeffrey Stedfast + + * providers/imap/camel-imap-store.c (connect_to_server): Added + some NULL protection fixes. + 2002-05-22 Jeffrey Stedfast * camel-remote-store.c: Removed from the build. Glory glory diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index d1d42b690c..312f6c2fb6 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -557,10 +557,16 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls, CamelE /* Read the greeting, if any. FIXME: deal with PREAUTH */ if (camel_imap_store_recv_line (store, &buf, ex) < 0) { - camel_object_unref (CAMEL_OBJECT (store->istream)); - camel_object_unref (CAMEL_OBJECT (store->ostream)); - store->istream = NULL; - store->ostream = NULL; + if (store->istream) { + camel_object_unref (CAMEL_OBJECT (store->istream)); + store->istream = NULL; + } + + if (store->ostream) { + camel_object_unref (CAMEL_OBJECT (store->ostream)); + store->ostream = NULL; + } + store->connected = FALSE; return FALSE; } @@ -568,10 +574,17 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls, CamelE /* get the imap server capabilities */ if (!imap_get_capability (service, ex)) { - camel_object_unref (CAMEL_OBJECT (store->istream)); - camel_object_unref (CAMEL_OBJECT (store->ostream)); - store->istream = NULL; - store->ostream = NULL; + if (store->istream) { + camel_object_unref (CAMEL_OBJECT (store->istream)); + store->istream = NULL; + } + + if (store->ostream) { + camel_object_unref (CAMEL_OBJECT (store->ostream)); + store->ostream = NULL; + } + + store->connected = FALSE; return FALSE; } -- cgit v1.2.3