fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-util: fix possible crash in nm_setting_update_secrets()

Browse source 
If a pointer to a valid GError was not passed the function could
crash.  Make it simpler and fix the possible crash by just converting
to hash table iters instead.
This commit is contained in:
Dan Williams 2011-01-19 18:17:40 -06:00
parent ec55e32ee6
commit 5dd4f1ea01
1 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
libnm-util/nm-setting.c
View file

@ -483,11 +483,6 @@ nm_setting_need_secrets (NMSetting *setting)
return secrets; return secrets;
} }
typedef struct {
NMSetting *setting;
GError **error;
} UpdateSecretsInfo;
static gboolean static gboolean
update_one_secret (NMSetting *setting, const char *key, GValue *value, GError **error) update_one_secret (NMSetting *setting, const char *key, GValue *value, GError **error)
{ {
@ -528,17 +523,6 @@ update_one_secret (NMSetting *setting, const char *key, GValue *value, GError **
return success; return success;
} }
static void
update_one_cb (gpointer key, gpointer val, gpointer user_data)
{
UpdateSecretsInfo *info = user_data;
const char *secret_key = (const char *) key;
GValue *secret_value = (GValue *) val;
if (*(info->error) == NULL)
NM_SETTING_GET_CLASS (info->setting)->update_one_secret (info->setting, secret_key, secret_value, info->error);
}
/** /**
* nm_setting_update_secrets: * nm_setting_update_secrets:
* @setting: the #NMSetting * @setting: the #NMSetting
@ -555,8 +539,9 @@ update_one_cb (gpointer key, gpointer val, gpointer user_data)
gboolean gboolean
nm_setting_update_secrets (NMSetting *setting, GHashTable *secrets, GError **error) nm_setting_update_secrets (NMSetting *setting, GHashTable *secrets, GError **error)
{ {
UpdateSecretsInfo *info; GHashTableIter iter;
gboolean success; gpointer key, data;
GError *tmp_error = NULL;
g_return_val_if_fail (setting != NULL, FALSE); g_return_val_if_fail (setting != NULL, FALSE);
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
@ -564,14 +549,16 @@ nm_setting_update_secrets (NMSetting *setting, GHashTable *secrets, GError **err
if (error) if (error)
g_return_val_if_fail (*error == NULL, FALSE); g_return_val_if_fail (*error == NULL, FALSE);
info = g_malloc0 (sizeof (UpdateSecretsInfo)); g_hash_table_iter_init (&iter, secrets);
info->setting = setting; while (g_hash_table_iter_next (&iter, &key, &data) && !tmp_error) {
info->error = error; const char *secret_key = (const char *) key;
g_hash_table_foreach (secrets, update_one_cb, info); GValue *secret_value = (GValue *) data;
success = *(info->error) ? FALSE : TRUE;
g_free (info);
return success; NM_SETTING_GET_CLASS (setting)->update_one_secret (setting, secret_key, secret_value, &tmp_error);
}
g_propagate_error (error, tmp_error);
return !!tmp_error;
} }
/** /**