diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-21 15:20:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-29 10:03:03 +0200 |
| commit | 5e7dedc48d782b9b751c701cb37b69a3f43bb47a (patch) | |
| tree | c2a6feb631aff8ecf3a2ec99fa072d29cd165203 | |
| parent | adeaadc1ae1ed28a17cef9e34f6c9c0783d87a7f (diff) | |
| download | NetworkManager-5e7dedc48d782b9b751c701cb37b69a3f43bb47a.tar.gz | |
libnm: assert in async_inited_obj_nm() for existing pending_init count
(cherry picked from commit 958ae36c179b1438adafbfbefbb16478663ef52d)
| -rw-r--r-- | libnm/nm-client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 61e07dd77f..3e75657805 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -2338,14 +2338,14 @@ async_inited_obj_nm (GObject *object, GAsyncResult *result, gpointer user_data) NMClientInitData *init_data = user_data; GError *error = NULL; + nm_assert (init_data && init_data->pending_init > 0); + if (!g_async_initable_init_finish (G_ASYNC_INITABLE (object), result, &error)) g_simple_async_result_take_error (init_data->result, error); - if (init_data) { - init_data->pending_init--; - if (init_data->pending_init == 0) - init_async_complete (init_data); - } + init_data->pending_init--; + if (init_data->pending_init == 0) + init_async_complete (init_data); } static void |