Fix bug #3139, "Mainwindow unresponsive due to a busy loop"

[claws.git] / src / common / session.c

diff --git a/src/common/session.c b/src/common/session.c
index 6e1e2b9d83bf981df84606fbb0265741c5d99825..25038c98fb1d3916e492fb0f9b2044130442ce33 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -166,6 +166,8 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
        sock->account = session->account;
        sock->is_smtp = session->is_smtp;
 #ifdef USE_GNUTLS
+       sock->gnutls_priority = session->gnutls_priority;
+
        if (session->ssl_type == SSL_TUNNEL) {
                sock_set_nonblocking_mode(sock, FALSE);
                if (!ssl_init_socket(sock)) {
@@ -226,6 +228,9 @@ void session_destroy(Session *session)
        g_byte_array_free(session->read_data_buf, TRUE);
        g_free(session->read_data_terminator);
        g_free(session->write_buf);
+#ifdef USE_GNUTLS
+       g_free(session->gnutls_priority);
+#endif
 
        debug_print("session (%p): destroyed\n", session);
 
@@ -523,9 +528,10 @@ static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
        session_set_timeout(session, session->timeout_interval);
 
        if (session->read_buf_len == 0) {
-               gint read_len;
+               gint read_len = -1;
 
-               read_len = sock_read(session->sock, session->read_buf,
+               if (session->sock)
+                       read_len = sock_read(session->sock, session->read_buf,
                                     SESSION_BUFFSIZE - 1);
 
                if (read_len == -1 && session->state == SESSION_DISCONNECTED) {