diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-07-30 14:09:40 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-08-02 23:00:26 +0200 |
| commit | bc614783f032deb166d531161f8eec0ac64f5cc4 (patch) | |
| tree | f296dc857624dd0fd4815558dbd0ef0af1edde33 | |
| parent | 69ed759ddf4a97723668fefda5ba458792d67b6b (diff) | |
| download | NetworkManager-bc614783f032deb166d531161f8eec0ac64f5cc4.tar.gz | |
cli: take a reference to device in AddAndActivateInfo
The device could vanish in between.
| -rw-r--r-- | clients/cli/devices.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index d36382f85c..f2625eb68f 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1841,6 +1841,13 @@ typedef struct { } AddAndActivateInfo; static void +add_and_activate_info_free (AddAndActivateInfo *info) +{ + g_object_unref (info->device); + g_free (info); +} + +static void add_and_activate_cb (GObject *client, GAsyncResult *result, gpointer user_data) @@ -1887,7 +1894,7 @@ add_and_activate_cb (GObject *client, } } - g_free (info); + add_and_activate_info_free (info); } static void @@ -1946,7 +1953,7 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data) nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; g_object_unref (active); quit (); - g_free (info); + add_and_activate_info_free (info); return; } @@ -1973,7 +1980,7 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data) g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc); } } - g_free (info); + add_and_activate_info_free (info); } static NMCResultCode @@ -2020,7 +2027,7 @@ do_device_connect (NmCli *nmc, int argc, char **argv) info = g_malloc0 (sizeof (AddAndActivateInfo)); info->nmc = nmc; - info->device = device; + info->device = g_object_ref (device); info->hotspot = FALSE; nm_client_activate_connection_async (nmc->client, @@ -3524,7 +3531,7 @@ do_device_wifi_connect (NmCli *nmc, int argc, char **argv) info = g_malloc0 (sizeof (AddAndActivateInfo)); info->nmc = nmc; - info->device = device; + info->device = g_object_ref (device); info->hotspot = FALSE; info->create = !existing_con; if (existing_con) { @@ -3894,7 +3901,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) info = g_malloc0 (sizeof (AddAndActivateInfo)); info->nmc = nmc; - info->device = device; + info->device = g_object_ref (device); info->hotspot = TRUE; info->create = TRUE; |