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

libnm: fix leak in nm_client_add_and_activate_connection{2,_async}()

Browse source 
Detected via valgrind:

  $ ./tools/run-nm-test.sh -m -v libnm/tests/test-nm-client -p /libnm/active-connections

Fixes: fbb038af5e
This commit is contained in:
Thomas Haller 2019-02-22 08:00:01 +01:00
parent b7d4ad8547
commit fefb965cfe
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm/nm-client.c
View file

@ -1168,7 +1168,7 @@ add_activate_cb (GObject *object,
{
gs_unref_object GSimpleAsyncResult *simple = user_data;
gs_unref_variant GVariant *result_data = NULL;
NMActiveConnection *ac;
gs_unref_object NMActiveConnection *ac = NULL;
GError *error = NULL;
ac = nm_manager_add_and_activate_connection_finish (NM_MANAGER (object), result, &result_data, &error);

18
libnm/nm-manager.c
View file

@ -918,6 +918,8 @@ activate_info_complete (ActivateInfo *info,
NMActiveConnection *active,
GError *error)
{
nm_assert ((!error) != (!active));
nm_clear_g_signal_handler (info->cancellable, &info->cancelled_id);
c_list_unlink_stale (&info->lst);
@ -1118,6 +1120,10 @@ add_activate_cb (GObject *object,
gs_free_error GError *error = NULL;
gboolean success;
nm_assert (info);
nm_assert (!info->active_path);
nm_assert (!info->add_and_activate_output);
if (info->activate_type == ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION) {
success = nmdbus_manager_call_add_and_activate_connection_finish (NMDBUS_MANAGER (object),
NULL,
@ -1209,12 +1215,12 @@ nm_manager_add_and_activate_connection_async (NMManager *manager,
info);
} else {
nmdbus_manager_call_add_and_activate_connection (priv->proxy,
dict,
nm_object_get_path (NM_OBJECT (device)),
specific_object ?: "/",
cancellable,
add_activate_cb,
info);
dict,
nm_object_get_path (NM_OBJECT (device)),
specific_object ?: "/",
cancellable,
add_activate_cb,
info);
}
}