|
 |
7b922c |
From f85322d23536c1004db8ddc722d4f2f6abc56aba Mon Sep 17 00:00:00 2001
|
|
|
7b922c |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
7b922c |
Date: Tue, 23 Apr 2019 11:10:33 +0200
|
|
|
7b922c |
Subject: [PATCH] settings: fix failed assertion
|
|
|
7b922c |
|
|
|
7b922c |
Fix the following assertion failure:
|
|
|
7b922c |
|
|
|
7b922c |
g_object_ref: assertion 'G_IS_OBJECT (object)' failed.
|
|
|
7b922c |
|
|
|
7b922c |
nm_settings_add_connection() can return a NULL connection.
|
|
|
7b922c |
|
|
|
7b922c |
Fixes: f034f17ff69c ('settings: keep the added connection alive for a bit longer')
|
|
|
7b922c |
(cherry picked from commit 48ce3628c528553d4105ed443934d733998e81b4)
|
|
|
7b922c |
(cherry picked from commit d80818e6cad94def1402be8326274bde998aa276)
|
|
|
7b922c |
---
|
|
|
7b922c |
src/settings/nm-settings.c | 2 +-
|
|
|
7b922c |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7b922c |
|
|
|
7b922c |
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
|
|
|
7b922c |
index 8e18a33e0..e594860bc 100644
|
|
|
7b922c |
--- a/src/settings/nm-settings.c
|
|
|
7b922c |
+++ b/src/settings/nm-settings.c
|
|
|
7b922c |
@@ -1174,7 +1174,7 @@ pk_add_cb (NMAuthChain *chain,
|
|
|
7b922c |
* because it's found to be incompatible with the device on AddAndActivate).
|
|
|
7b922c |
* But we need to keep it alive for a bit longer, precisely to check wehther
|
|
|
7b922c |
* it's still known to the setting manager. */
|
|
|
7b922c |
- g_object_ref (added);
|
|
|
7b922c |
+ nm_g_object_ref (added);
|
|
|
7b922c |
}
|
|
|
7b922c |
|
|
|
7b922c |
callback = nm_auth_chain_get_data (chain, "callback");
|
|
|
7b922c |
--
|
|
|
7b922c |
2.20.1
|
|
|
7b922c |
|