talons

commit 483f9b039ebac3c95313b596df060571f5f00840
parent 2836acb33589ba81188513fddc632836c6b1e2ff
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Thu, 11 Feb 2016 00:52:49 +0100

Fix two crashes in IMAP introduced by the passwords change.

Diffstat:
M
src/imap.c
 | 
15
++++++++++-----

1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/imap.c b/src/imap.c
@@ -1284,9 +1284,11 @@ try_again:
 	if ((ok = imap_auth(session, account->userid, pass, account->imap_auth_type)) != MAILIMAP_NO_ERROR) {
 		
 		if (!failed && !is_fatal(ok)) {
-			memset(acc_pass, 0, strlen(acc_pass));
-			g_free(acc_pass);
-			acc_pass = NULL;
+			if (acc_pass != NULL) {
+				memset(acc_pass, 0, strlen(acc_pass));
+				g_free(acc_pass);
+				acc_pass = NULL;
+			}
 			failed = TRUE;
 			if (account->session_passwd != NULL) {
 				g_free(account->session_passwd);
@@ -1301,8 +1303,11 @@ try_again:
 				alertpanel_error_log(_("Couldn't login to IMAP server %s."), account->recv_server);
 		}
 
-		g_free(acc_pass);
-		memset(acc_pass, 0, strlen(acc_pass));
+		if (acc_pass != NULL) {
+			g_free(acc_pass);
+			memset(acc_pass, 0, strlen(acc_pass));
+		}
+
 		return ok;
 	}