fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 09:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: fix crash on connection delete/down timeout

Browse source 
connection_op_timeout_cb() passed a wrong object type to timeout_cb();
fix this.

Fixes: ac888de151

https://bugzilla.redhat.com/show_bug.cgi?id=1355740
This commit is contained in:
Beniamino Galvani 2016-07-18 18:50:24 +02:00
parent 84a76a93d9
commit 1fbdd4d008
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clients/cli/connections.c
View file

@ -2137,16 +2137,20 @@ vpn_connection_state_cb (NMVpnConnection *vpn,
}
}
static void
set_nmc_error_timeout (NmCli *nmc)
{
g_string_printf (nmc->return_text, _("Error: Timeout expired (%d seconds)"), nmc->timeout);
nmc->return_value = NMC_RESULT_ERROR_TIMEOUT_EXPIRED;
}
static gboolean
timeout_cb (gpointer user_data)
activate_connection_timeout_cb (gpointer user_data)
{
ActivateConnectionInfo *info = user_data;
NmCli *nmc = info->nmc;
/* Time expired -> exit nmcli */
g_string_printf (nmc->return_text, _("Error: Timeout %d sec expired."), nmc->timeout);
nmc->return_value = NMC_RESULT_ERROR_TIMEOUT_EXPIRED;
set_nmc_error_timeout (info->nmc);
activate_connection_info_finish (info);
return FALSE;
}
@ -2265,7 +2269,7 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat
}
/* Start timer not to loop forever when signals are not emitted */
g_timeout_add_seconds (nmc->timeout, timeout_cb, info);
g_timeout_add_seconds (nmc->timeout, activate_connection_timeout_cb, info);
/* Fail when the active connection goes away. */
g_signal_connect (nmc->client, NM_CLIENT_ACTIVE_CONNECTION_REMOVED,
@ -2597,7 +2601,7 @@ connection_op_timeout_cb (gpointer user_data)
{
ConnectionCbInfo *info = user_data;
timeout_cb (info->nmc);
set_nmc_error_timeout (info->nmc);
connection_cb_info_finish (info, NULL);
return G_SOURCE_REMOVE;
}