From b933308658628c437daa43d7152eacecf45f8957 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 5 Nov 2007 12:45:42 +0000 Subject: [PATCH] * fix some potential NULL-dereferences pmo-trunk-r3643 --- src/modest-mail-operation.c | 13 +++++++++---- src/modest-tny-account-store.c | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index a3a2f03..7766262 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -2664,9 +2664,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, TnyHeader *header = NULL; ModestTnyFolderRules rules = 0; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_LIST (headers)); - g_return_if_fail (TNY_IS_FOLDER (folder)); + g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (headers && TNY_IS_LIST (headers)); + g_return_if_fail (folder && TNY_IS_FOLDER (folder)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); priv->total = tny_list_get_length (headers); @@ -2694,9 +2694,14 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, src_folder = tny_header_get_folder (header); g_object_unref (header); } - g_object_unref (iter); + if (src_folder == NULL) { + g_warning ("%s: cannot find folder from header", __FUNCTION__); + return; + } + + /* Check folder source and destination */ if (src_folder == folder) { /* Set status failed and set an error */ diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index ac7dd11..7ae950b 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -708,7 +708,8 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc g_free (username); username = NULL; } else - *cancel = FALSE; + if (cancel) + *cancel = FALSE; /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */ -- 1.7.9.5