From e75f5bc862da6bd2d80a7b8a1ded2d81695fc3cf Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 25 May 2011 18:52:55 -0500 Subject: [PATCH] settings: only update transient secrets if they exist Otherwise here the transient_secrets GHashTable will be NULL, and g_hash_table_iter_init() doesn't like that much. --- src/settings/nm-settings-connection.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 15523f6b9f..9207909320 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -336,11 +336,13 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self, update_secrets_cache (self); /* And add the transient secrets back */ - g_hash_table_iter_init (&iter, transient_secrets); - while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting_hash)) { - setting = nm_connection_get_setting_by_name (NM_CONNECTION (self), setting_name); - if (setting) - nm_setting_update_secrets (setting, setting_hash, NULL); + if (transient_secrets) { + g_hash_table_iter_init (&iter, transient_secrets); + while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting_hash)) { + setting = nm_connection_get_setting_by_name (NM_CONNECTION (self), setting_name); + if (setting) + nm_setting_update_secrets (setting, setting_hash, NULL); + } } nm_settings_connection_recheck_visibility (self);