fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-24 10:10:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-glib: fix crash calling activation callback

Browse source 
Duh, need to zero the memory before reading from it.  It was
crashing in recheck_pending_activations() because the info->active_path
was random memory.
This commit is contained in:
Dan Williams 2011-03-24 23:20:32 -05:00
parent 7da9e2f607
commit 5ee1039067
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libnm-glib/nm-client.c
View file

@ -41,8 +41,6 @@
void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
static void recheck_pending_activations (NMClient *self);
G_DEFINE_TYPE (NMClient, nm_client, NM_TYPE_OBJECT)
#define NM_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CLIENT, NMClientPrivate))
@ -617,11 +615,12 @@ recheck_pending_activations (NMClient *self)
*/
for (i = 0; i < active_connections->len; i++) {
NMActiveConnection *active = g_ptr_array_index (active_connections, i);
const char *active_path = nm_object_get_path (NM_OBJECT (active));
for (iter = priv->pending_activations; iter; iter = g_slist_next (iter)) {
ActivateInfo *info = iter->data;
if (g_strcmp0 (info->active_path, nm_object_get_path (NM_OBJECT (active))) == 0) {
if (g_strcmp0 (info->active_path, active_path) == 0) {
/* Call the pending activation's callback and it all up*/
activate_info_complete (info, active, NULL);
activate_info_free (info);
@ -687,7 +686,7 @@ nm_client_activate_connection (NMClient *client,
g_return_if_fail (NM_IS_DEVICE (device));
g_return_if_fail (NM_IS_CONNECTION (connection));
info = g_slice_new (ActivateInfo);
info = g_slice_new0 (ActivateInfo);
info->act_fn = callback;
info->user_data = user_data;
info->client = client;
@ -759,7 +758,7 @@ nm_client_add_and_activate_connection (NMClient *client,
g_return_if_fail (NM_IS_CLIENT (client));
g_return_if_fail (NM_IS_DEVICE (device));
info = g_slice_new (ActivateInfo);
info = g_slice_new0 (ActivateInfo);
info->add_act_fn = callback;
info->user_data = user_data;
info->client = client;