[Commits] [SCM] claws branch, master, updated. 3.9.3-133-gf09ae1f

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  f09ae1ff789f4225465fdef33da930fac8f00191 (commit)
       via  68da8a3e5f60f04fca65e2cb3c58384d530653da (commit)
      from  cbcbd9f670977dc662cc57ffc16c9da0785d09e5 (commit)


- Log -----------------------------------------------------------------
commit f09ae1ff789f4225465fdef33da930fac8f00191
Author: Colin Leroy <colin at colino.net>
Date:   Thu May 1 20:11:35 2014 +0200

    More leak fix for bug #3155

diff --git a/src/imap.c b/src/imap.c
index c1de5b3..7bfceeb 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1045,10 +1045,10 @@ new_conn:
 		rfolder->session = NULL;
 		if (!is_fatal(r)) {
 			imap_threaded_disconnect(session->folder);
-			SESSION(session)->state = SESSION_DISCONNECTED;
-			SESSION(session)->sock = NULL;
-			imap_safe_destroy(session);
 		}
+		SESSION(session)->state = SESSION_DISCONNECTED;
+		SESSION(session)->sock = NULL;
+		imap_safe_destroy(session);
 		rfolder->last_failure = time(NULL);
 		rfolder->connecting = FALSE;
 		return NULL;
@@ -1071,6 +1071,9 @@ new_conn:
 			else {
 				rfolder->session = NULL;
 				rfolder->connecting = FALSE;
+				SESSION(session)->state = SESSION_DISCONNECTED;
+				SESSION(session)->sock = NULL;
+				imap_safe_destroy(session);
 				session = imap_session_get(folder);
 			}
 		}

commit 68da8a3e5f60f04fca65e2cb3c58384d530653da
Author: Colin Leroy <colin at colino.net>
Date:   Thu May 1 18:56:21 2014 +0200

    Really fix leak (Thanks!)

diff --git a/src/imap.c b/src/imap.c
index b2bd8bc..c1de5b3 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1595,8 +1595,8 @@ static gboolean imap_is_msg_fully_cached(Folder *folder, FolderItem *item, gint
 			return TRUE;
 		}
 		size = get_file_size_with_crs(filename);
-		g_free(filename);
 	}
+	g_free(filename);
 	debug_print("msg %d cached, has size %d, full should be %d.\n", uid, size, cached->size);
 	if (cached && size >= cached->size) {
 		cached->total_size = cached->size;

-----------------------------------------------------------------------

Summary of changes:
 src/imap.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Claws Mail