fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 07:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: take a reference to device in AddAndActivateInfo

Browse source 
The device could vanish in between.
This commit is contained in:
Lubomir Rintel 2019-07-30 14:09:40 +02:00
parent 69ed759ddf
commit bc614783f0
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
clients/cli/devices.c
View file

@ -1840,6 +1840,13 @@ typedef struct {
gboolean create; gboolean create;
} AddAndActivateInfo; } AddAndActivateInfo;
static void
add_and_activate_info_free (AddAndActivateInfo *info)
{
g_object_unref (info->device);
g_free (info);
}
static void static void
add_and_activate_cb (GObject *client, add_and_activate_cb (GObject *client,
GAsyncResult *result, GAsyncResult *result,
@ -1887,7 +1894,7 @@ add_and_activate_cb (GObject *client,
} }
} }
g_free (info); add_and_activate_info_free (info);
} }
static void static void
@ -1946,7 +1953,7 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
g_object_unref (active); g_object_unref (active);
quit (); quit ();
g_free (info); add_and_activate_info_free (info);
return; 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_timeout_add_seconds (nmc->timeout, timeout_cb, nmc);
} }
} }
g_free (info); add_and_activate_info_free (info);
} }
static NMCResultCode static NMCResultCode
@ -2020,7 +2027,7 @@ do_device_connect (NmCli *nmc, int argc, char **argv)
info = g_malloc0 (sizeof (AddAndActivateInfo)); info = g_malloc0 (sizeof (AddAndActivateInfo));
info->nmc = nmc; info->nmc = nmc;
info->device = device; info->device = g_object_ref (device);
info->hotspot = FALSE; info->hotspot = FALSE;
nm_client_activate_connection_async (nmc->client, 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 = g_malloc0 (sizeof (AddAndActivateInfo));
info->nmc = nmc; info->nmc = nmc;
info->device = device; info->device = g_object_ref (device);
info->hotspot = FALSE; info->hotspot = FALSE;
info->create = !existing_con; info->create = !existing_con;
if (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 = g_malloc0 (sizeof (AddAndActivateInfo));
info->nmc = nmc; info->nmc = nmc;
info->device = device; info->device = g_object_ref (device);
info->hotspot = TRUE; info->hotspot = TRUE;
info->create = TRUE; info->create = TRUE;