From: Sergio Villar Senin Date: Tue, 18 Nov 2008 10:12:12 +0000 (+0000) Subject: * Fixes NB#89992, do not crash when starting modest with corrupt account data X-Git-Tag: git_migration_finished~1024 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=8576d94968a6202c4a6b760d00213281baaa6b47 * Fixes NB#89992, do not crash when starting modest with corrupt account data pmo-trunk-r6323 --- diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c index 316e746..6589ce6 100644 --- a/src/modest-account-mgr-helpers.c +++ b/src/modest-account-mgr-helpers.c @@ -449,15 +449,19 @@ modest_account_mgr_set_server_account_security (ModestAccountMgr *self, modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, str_value, TRUE); } -ModestServerAccountSettings* +ModestServerAccountSettings * modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* name, gboolean is_transport_and_not_store) { ModestServerAccountSettings *settings; ModestProtocol *protocol; ModestProtocolRegistry *registry; gchar *string; - - g_return_val_if_fail (modest_account_mgr_account_exists (self, name, TRUE), NULL); + + if (!modest_account_mgr_account_exists (self, name, TRUE)) { + g_message ("%s account %s does not exist", __FUNCTION__, name); + return NULL; + } + registry = modest_runtime_get_protocol_registry (); settings = modest_server_account_settings_new (); @@ -465,23 +469,38 @@ modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* na string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_HOSTNAME,TRUE); - modest_server_account_settings_set_hostname (settings, string); - g_free (string); + if (string) { + modest_server_account_settings_set_hostname (settings, string); + g_free (string); + } else { + goto on_error; + } string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_USERNAME,TRUE); - modest_server_account_settings_set_username (settings, string); - g_free (string); + if (string) { + modest_server_account_settings_set_username (settings, string); + g_free (string); + } else { + goto on_error; + } string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE); - if (is_transport_and_not_store) { - protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS, string); + if (string) { + gchar *tag = NULL; + if (is_transport_and_not_store) { + tag = MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS; + } else { + tag = MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS; + } + protocol = modest_protocol_registry_get_protocol_by_name (registry, tag, string); + + modest_server_account_settings_set_protocol (settings, + modest_protocol_get_type_id (protocol)); + g_free (string); } else { - protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS, string); + goto on_error; } - modest_server_account_settings_set_protocol (settings, - modest_protocol_get_type_id (protocol)); - g_free (string); modest_server_account_settings_set_port (settings, modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_PORT, TRUE)); @@ -495,7 +514,7 @@ modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* na } else { modest_server_account_settings_set_auth_protocol (settings, MODEST_PROTOCOLS_AUTH_NONE); } - + string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SECURITY, TRUE); if (string) { protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_CONNECTION_PROTOCOLS, string); @@ -509,15 +528,23 @@ modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* na string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PASSWORD, TRUE); - modest_server_account_settings_set_password (settings, string); - g_free (string); - + if (string) { + modest_server_account_settings_set_password (settings, string); + g_free (string); + } + string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_URI, TRUE); - modest_server_account_settings_set_uri (settings, string); - g_free (string); - + if (string) { + modest_server_account_settings_set_uri (settings, string); + g_free (string); + } + return settings; + + on_error: + g_free (settings); + return NULL; } gboolean @@ -664,10 +691,19 @@ modest_account_mgr_load_account_settings (ModestAccountMgr *self, if (server_account) { ModestServerAccountSettings *store_settings; store_settings = modest_account_mgr_load_server_settings (self, server_account, FALSE); - modest_account_settings_set_store_settings (settings, - store_settings); - g_object_unref (store_settings); g_free (server_account); + + /* It could happen that the account data is corrupted + so it's not loaded properly */ + if (store_settings) { + modest_account_settings_set_store_settings (settings, + store_settings); + g_object_unref (store_settings); + } else { + g_message ("%s can not load server settings. Account corrupted?", __FUNCTION__); + g_object_unref (settings); + return NULL; + } } /* transport */ @@ -677,9 +713,16 @@ modest_account_mgr_load_account_settings (ModestAccountMgr *self, if (server_account) { ModestServerAccountSettings *transport_settings; transport_settings = modest_account_mgr_load_server_settings (self, server_account, TRUE); - modest_account_settings_set_transport_settings (settings, transport_settings); - g_object_unref (transport_settings); g_free (server_account); + + if (transport_settings) { + modest_account_settings_set_transport_settings (settings, transport_settings); + g_object_unref (transport_settings); + } else { + g_message ("%s can not load server settings. Account corrupted?", __FUNCTION__); + g_object_unref (settings); + return NULL; + } } return settings; diff --git a/src/modest-protocol-registry.c b/src/modest-protocol-registry.c index dae386f..26a6cfc 100644 --- a/src/modest-protocol-registry.c +++ b/src/modest-protocol-registry.c @@ -322,12 +322,17 @@ find_protocol_by_name (ModestProtocolType type_id, } ModestProtocol * -modest_protocol_registry_get_protocol_by_name (ModestProtocolRegistry *self, const gchar *tag, const gchar *name) +modest_protocol_registry_get_protocol_by_name (ModestProtocolRegistry *self, + const gchar *tag, + const gchar *name) { ModestProtocolRegistryPrivate *priv; GHashTable *tag_table; g_return_val_if_fail (MODEST_IS_PROTOCOL_REGISTRY (self), NULL); + g_return_val_if_fail (tag, NULL); + g_return_val_if_fail (name, NULL); + priv = MODEST_PROTOCOL_REGISTRY_GET_PRIVATE (self); tag_table = g_hash_table_lookup (priv->tags_table, tag); diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index 76cb853..8ad2bb9 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -492,16 +492,22 @@ restore_settings_folder_view (ModestConf *conf, default_acc = modest_account_mgr_get_default_account (mgr); if (default_acc) { ModestAccountSettings *settings; - ModestServerAccountSettings *store_settings; const gchar *server_acc_id; settings = modest_account_mgr_load_account_settings (mgr, (const gchar*) default_acc); - store_settings = modest_account_settings_get_store_settings (settings); - server_acc_id = modest_server_account_settings_get_account_name (store_settings); - - modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id); - g_object_unref (store_settings); - g_object_unref (settings); + /* If there was any problem with the settings storage + the settings could be NULL */ + if (settings) { + ModestServerAccountSettings *store_settings; + store_settings = modest_account_settings_get_store_settings (settings); + + if (store_settings) { + server_acc_id = modest_server_account_settings_get_account_name (store_settings); + modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id); + g_object_unref (store_settings); + } + g_object_unref (settings); + } g_free (default_acc); } return TRUE;