diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-02 16:10:28 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-02 20:18:04 +0100 |
| commit | 35988ec633bc7dc9a4f85b17b5a59f62645e0f7d (patch) | |
| tree | 683017c9e02a1098e5eb0b3afcb147c82209c873 | |
| parent | 4615d74de0d885266d0fca5ddfeeab3afe969cb2 (diff) | |
| download | NetworkManager-35988ec633bc7dc9a4f85b17b5a59f62645e0f7d.tar.gz | |
ifcfg-rh: avoid passing NULL error to connection_from_file_full()
It causes an assertion failure:
(NetworkManager:20800): NetworkManager-ifcfg-rh-CRITICAL **: wireless_connection_from_ifcfg: assertion 'error != NULL' failed
Fixes: 12bfaf5a8da788ae5ed50c0c93c203250a6ecf8b
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/reader.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 478d1b24eb..fb60486bdd 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -4830,13 +4830,18 @@ connection_from_file (const char *filename, { gboolean ignore_error = FALSE; NMConnection *conn; + GError *local = NULL; conn = connection_from_file_full (filename, NULL, NULL, out_unhandled, - error, + &local, &ignore_error); - if (error && *error && !ignore_error) - PARSE_WARNING ("%s", (*error)->message); + if (local) { + if (!ignore_error) + PARSE_WARNING ("%s", local->message); + g_propagate_error (error, local); + } + return conn; } |