unlink file before writing it

[apps/madmutt.git] / lib-sys / mutt_socket.c

diff --git a/lib-sys/mutt_socket.c b/lib-sys/mutt_socket.c
index 194ad5a..0acee2a 100644 (file)
--- a/lib-sys/mutt_socket.c
+++ b/lib-sys/mutt_socket.c
@@ -156,7 +156,7 @@ int mutt_socket_readln2(buffer_t *buf, CONNECTION *conn)
 
     while (mutt_socket_readchar(conn, &ch) == 1) {
         if (ch == '\n') {
-            if (buf->data[buf->len - 1] == '\r') {
+            if (buf->len && buf->data[buf->len - 1] == '\r') {
                 buf->data[--buf->len] = '\0';
             }
             return 0;
@@ -230,7 +230,7 @@ CONNECTION *mutt_conn_find (const CONNECTION * start, const ACCOUNT * account)
 
   if (Tunnel && *Tunnel)
     mutt_tunnel_socket_setup (conn);
-  else if (account->flags & M_ACCT_SSL) {
+  else if (account->has_ssl) {
     if (mutt_ssl_socket_setup (conn) < 0) {
       mutt_socket_free (conn);
       return NULL;