From 975d45309f4be66543d779269dfa04050b07b40c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 22 May 2019 19:51:35 +0200 Subject: libnm/keyfile: don't parse JSON config in keyfile reader twice Commit d6ec009afd7d ('team: normalize invalid configuration during load') let's keyfile reader ignore JSON configs that cannot be parsed. Keep doing that, but don't parse the JSON twice for that. Just set the JSON, and if the setting afterwards does not verify, reset it to NULL. We also get a better error message and in most cases we don't need to parse twice. --- libnm-core/nm-keyfile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c index 6a4681a3ae..9ac3eb4e18 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -1619,16 +1619,16 @@ team_config_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key gs_free_error GError *error = NULL; conf = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL); + + g_object_set (G_OBJECT (setting), key, conf, NULL); + if ( conf - && conf[0] - && !nm_utils_is_json_object (conf, &error)) { + && !nm_setting_verify (setting, NULL, &error)) { handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN, _("ignoring invalid team configuration: %s"), error->message); - g_clear_pointer (&conf, g_free); + g_object_set (G_OBJECT (setting), key, NULL, NULL); } - - g_object_set (G_OBJECT (setting), key, conf, NULL); } static void -- cgit v1.2.1