From 5e7dedc48d782b9b751c701cb37b69a3f43bb47a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 21 Jun 2017 15:20:19 +0200 Subject: [PATCH] libnm: assert in async_inited_obj_nm() for existing pending_init count (cherry picked from commit 958ae36c179b1438adafbfbefbb16478663ef52d) --- libnm/nm-client.c | 10 +++++----- 1 file 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