From ee032f79dfd08294799e1d9749702910bcc5fb9e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 9 Dec 2019 09:51:55 +0100 Subject: [PATCH] settings: assert that we don't leak error variable in impl_settings_load_connections() (cherry picked from commit e0569ee575a40f401b2cca1acbd9cddd5fa567cd) (cherry picked from commit 7e8a5d98e37180acefeacc3150c5e8c4cda48f1b) --- src/settings/nm-settings.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 6529cc5800..b55021ca35 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -2776,9 +2776,10 @@ impl_settings_load_connections (NMDBusObject *obj, for (i = 0; i < n_entries; i++) { NMSettingsPluginConnectionLoadEntry *entry = &entries[i]; - if (!entry->handled) + if (!entry->handled) { _LOGW ("load: no settings plugin could load \"%s\"", entry->filename); - else if (entry->error) { + nm_assert (!entry->error); + } else if (entry->error) { _LOGW ("load: failure to load \"%s\": %s", entry->filename, entry->error->message); g_clear_error (&entry->error); } else