Fix the APOP check to not crash on servers that don't return any

	* providers/pop3/camel-pop3-store.c (connect_to_server): Fix the
	APOP check to not crash on servers that don't return any
	information on the +OK greeting line.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index def6d5d..dee6af3 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-27  Dan Winship  <danw@helixcode.com>
+
+       * providers/pop3/camel-pop3-store.c (connect_to_server): Fix the
+       APOP check to not crash on servers that don't return any
+       information on the +OK greeting line.
+
 2000-12-24  Not Zed  <NotZed@HelixCode.com>
 
        * providers/imap/camel-imap-search.c (imap_body_contains): Lock

diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 2f23bf0..6fc56fc 100644 (file)
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -230,14 +230,16 @@ connect_to_server (CamelService *service, /*gboolean real, */CamelException *ex)
        if (status != CAMEL_POP3_OK)
                return FALSE;
 
-       apoptime = strchr (buf, '<');
-       apopend = apoptime ? strchr (apoptime, '>') : NULL;
-       if (apopend) {
-               store->apop_timestamp = g_strndup (apoptime,
-                                                  apopend - apoptime + 1);
-               memmove (apoptime, apopend + 1, strlen (apopend + 1));
+       if (buf) {
+               apoptime = strchr (buf, '<');
+               apopend = apoptime ? strchr (apoptime, '>') : NULL;
+               if (apopend) {
+                       store->apop_timestamp =
+                               g_strndup (apoptime, apopend - apoptime + 1);
+                       memmove (apoptime, apopend + 1, strlen (apopend + 1));
+               }
+               store->implementation = buf;
        }
-       store->implementation = buf;
 
        /* Check extensions */
        store->login_delay = -1;