fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 15:20:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients: avoid clearing a structure pointer when we're still using it

Browse source 
We're dereferencing the info pointer in the argument list in the call to
nm_client_activate_connection_async(). Stealing it at that point causes
a crash.

This reverts a chunk of commit b298f2e605 ('cli: use cleanup macro for
freeing AddAndActivateInfo').
This commit is contained in:
Lubomir Rintel 2019-09-02 12:26:42 +02:00
parent 576a128954
commit b76da15dbf
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clients/cli/devices.c
View file

@ -3153,7 +3153,7 @@ static void
activate_update2_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
{
NMRemoteConnection *remote_con = NM_REMOTE_CONNECTION (source_object);
nm_auto_free_add_and_activate_info AddAndActivateInfo *info = user_data;
AddAndActivateInfo *info = user_data;
NmCli *nmc = info->nmc;
gs_unref_variant GVariant *ret = NULL;
GError *error = NULL;
@ -3165,6 +3165,7 @@ activate_update2_cb (GObject *source_object, GAsyncResult *res, gpointer user_da
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
g_error_free (error);
quit ();
add_and_activate_info_free (info);
return;
}
@ -3174,7 +3175,7 @@ activate_update2_cb (GObject *source_object, GAsyncResult *res, gpointer user_da
info->specific_object,
NULL,
add_and_activate_cb,
g_steal_pointer (&info));
info);
}
static NMCResultCode