From 1a9626a1582455159bfeb0997aab45e589088859 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 18 Mar 2009 17:12:49 +0000 Subject: [PATCH] Fixes FWNULL 1/16 & 2/16 pmo-trunk-r8169 --- src/modest-ui-actions.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 58ae3fb..8646f01 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -6561,6 +6561,9 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win) folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); } + if (!header || !folder) + goto frees; + /* Get the account type */ account = tny_folder_get_account (TNY_FOLDER (folder)); proto = modest_tny_account_get_protocol_type (account); @@ -6575,10 +6578,14 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win) msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error")); } + frees: /* Frees */ - g_object_unref (account); - g_object_unref (folder); - g_object_unref (header); + if (account) + g_object_unref (account); + if (folder) + g_object_unref (folder); + if (header) + g_object_unref (header); return msg; } -- 1.7.9.5