Fix two crashes in IMAP introduced by the passwords change.

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index a1497979437039ec2a1d1de101b372b8b59f697b..f40d00274667ec966c08d634722394b3ade95904 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -71,6 +71,7 @@
 #include "account.h"
 #include "tags.h"
 #include "main.h"
+#include "password.h"
 
 typedef struct _IMAPFolder     IMAPFolder;
 typedef struct _IMAPSession    IMAPSession;
@@ -1263,7 +1264,7 @@ static gint imap_session_authenticate(IMAPSession *session,
                Xstrdup_a(acc_pass, pass, {g_free(pass); return MAILIMAP_NO_ERROR;});
                g_free(pass);
        } else {
-               acc_pass = account->passwd;
+               acc_pass = password_decrypt(account->passwd, NULL);
        }
 try_again:
        pass = acc_pass;
@@ -1272,8 +1273,9 @@ try_again:
                tmp_pass = input_dialog_query_password_keep(account->recv_server, 
                                                            account->userid,
                                                            &(account->session_passwd));
-               if (!tmp_pass)
+               if (!tmp_pass) {
                        return MAILIMAP_NO_ERROR;
+               }
                Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return MAILIMAP_NO_ERROR;});
                g_free(tmp_pass);
        } else if (account->imap_auth_type == IMAP_AUTH_ANON || account->imap_auth_type == IMAP_AUTH_GSSAPI) {
@@ -1282,7 +1284,11 @@ try_again:
        if ((ok = imap_auth(session, account->userid, pass, account->imap_auth_type)) != MAILIMAP_NO_ERROR) {
                
                if (!failed && !is_fatal(ok)) {
-                       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);
@@ -1295,11 +1301,20 @@ try_again:
                                mainwindow_show_error();
                        } else
                                alertpanel_error_log(_("Couldn't login to IMAP server %s."), account->recv_server);
-               }               
+               }
+
+               if (acc_pass != NULL) {
+                       g_free(acc_pass);
+                       memset(acc_pass, 0, strlen(acc_pass));
+               }
 
                return ok;
        } 
 
+       if (acc_pass) {
+               memset(acc_pass, 0, strlen(acc_pass));
+               g_free(acc_pass);
+       }
        statuswindow_pop_all();
        session->authenticated = TRUE;
        return MAILIMAP_NO_ERROR;
@@ -1540,7 +1555,7 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                                                        have_size, cached->size);
                                        procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
                                }
-                               procmsg_msginfo_free(cached);
+                               procmsg_msginfo_free(&cached);
                                return filename;
                        } else if (!cached && time(NULL) - get_file_mtime(filename) < 60) {
                                debug_print("message not cached and file recent, considering file complete\n");
@@ -1548,18 +1563,18 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                                if (ok == 0)
                                        return filename;
                        } else {
-                               procmsg_msginfo_free(cached);
+                               procmsg_msginfo_free(&cached);
                        }
                }
                if (cached && MSG_IS_FULLY_CACHED(cached->flags)) {
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                        return filename;
                }
        } else {
                MsgInfo *cached = msgcache_get_msg(item->cache,uid);
                if (cached) {
                        procmsg_msginfo_unset_flags(cached, MSG_FULLY_CACHED, 0);
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                }
        }
 
@@ -1602,13 +1617,13 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                MsgInfo *cached = msgcache_get_msg(item->cache,uid);
                if (cached) {
                        procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                }
        } else if (ok == -1) {
                MsgInfo *cached = msgcache_get_msg(item->cache,uid);
                if (cached) {
                        procmsg_msginfo_unset_flags(cached, MSG_FULLY_CACHED, 0);
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                }
        }
        return filename;
@@ -1624,7 +1639,7 @@ static gboolean imap_is_msg_fully_cached(Folder *folder, FolderItem *item, gint
                return FALSE;
 
        if (MSG_IS_FULLY_CACHED(cached->flags)) {
-               procmsg_msginfo_free(cached);
+               procmsg_msginfo_free(&cached);
                return TRUE;
        }
 
@@ -1644,11 +1659,11 @@ static gboolean imap_is_msg_fully_cached(Folder *folder, FolderItem *item, gint
        if (cached && size >= cached->size) {
                cached->total_size = cached->size;
                procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
-               procmsg_msginfo_free(cached);
+               procmsg_msginfo_free(&cached);
                return TRUE;
        }
        if (cached)
-               procmsg_msginfo_free(cached);
+               procmsg_msginfo_free(&cached);
        return FALSE;   
 }
 
@@ -3048,7 +3063,7 @@ static gchar *imap_encode_unsafe_chars(const gchar *str)
                return NULL;
        ret = g_malloc(3*strlen(str)+1);
        o_ret = ret;
-       for (i = str; *i; i++) {
+       for (i = (gchar *)str; *i; i++) {
                switch(*i) {
                        case ':':
                        case '|':
@@ -3323,9 +3338,9 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
                g_free(real_oldpath);
                return -1;
        }
-       if (strchr(item->path, G_DIR_SEPARATOR)) {
+       if (strchr(item->path, '/')) {
                dirpath = g_path_get_dirname(item->path);
-               newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL);
+               newpath = g_strconcat(dirpath, "/", name, NULL);
                g_free(dirpath);
        } else
                newpath = g_strdup(name);
@@ -4464,11 +4479,11 @@ static gboolean imap_rename_folder_func(GNode *node, gpointer data)
        }
 
        base = item->path + oldpathlen;
-       while (*base == G_DIR_SEPARATOR) base++;
+       while (*base == '/') base++;
        if (*base == '\0')
                new_itempath = g_strdup(newpath);
        else
-               new_itempath = g_strconcat(newpath, G_DIR_SEPARATOR_S, base,
+               new_itempath = g_strconcat(newpath, "/", base,
                                           NULL);
 
        real_oldpath = imap_get_real_path(session, IMAP_FOLDER(item->folder), item->path, &ok);
@@ -4604,7 +4619,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        if (FOLDER_ITEM(item)->path) 
                statusbar_print_all(_("Scanning folder %s%c%s..."),
                                      FOLDER_ITEM(item)->folder->name, 
-                                     G_DIR_SEPARATOR,
+                                     '/',
                                      FOLDER_ITEM(item)->path);
        else
                statusbar_print_all(_("Scanning folder %s..."),
@@ -5407,7 +5422,7 @@ static gint imap_get_flags(Folder *folder, FolderItem *item,
                data->full_search = TRUE;
        
        for (cur = tmp; cur; cur = cur->next)
-               procmsg_msginfo_free((MsgInfo *)cur->data);
+               procmsg_msginfo_free((MsgInfo **)&(cur->data));
        
        g_slist_free(tmp);