summaryrefslogtreecommitdiff
path: root/libnm-glib
diff options
context:
space:
mode:
authorRui Matos <tiagomatos@gmail.com>2015-01-08 15:56:14 +0100
committerThomas Haller <thaller@redhat.com>2015-01-08 16:16:18 +0100
commit01f358ec347d841eeed63c497bca56b9e1d673be (patch)
treeedeb176b9fd7dbc9e608664be85a0f47b9cf5922 /libnm-glib
parentda31779f104a8c48a4fa1bda184de4bbdd828f3a (diff)
downloadNetworkManager-01f358ec347d841eeed63c497bca56b9e1d673be.tar.gz
libnm-glib/nm-client: zero the CheckConnectivityData structure
Otherwise, if the caller doesn't provide a cancellable we'll try to access a bogus ccd->cancellable in check_connectivity_data_free() and crash. https://bugzilla.gnome.org/show_bug.cgi?id=740841 (cherry picked from commit 8c32ea916ba0c86c4c50d6d4c7b6021adfbfdf02)
Diffstat (limited to 'libnm-glib')
-rw-r--r--libnm-glib/nm-client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index a29664c6ba..b9e393d965 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -1548,7 +1548,7 @@ nm_client_check_connectivity_async (NMClient *client,
g_return_if_fail (NM_IS_CLIENT (client));
priv = NM_CLIENT_GET_PRIVATE (client);
- ccd = g_slice_new (CheckConnectivityData);
+ ccd = g_slice_new0 (CheckConnectivityData);
ccd->client = client;
simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data,