colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-03-14 Tambet Ingo <tambet@gmail.com>

Browse Source 
* src/NetworkManagerPolicy.c (auto_activate_device): Don't leak device and
	data.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3463 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2008-03-14 21:42:03 +00:00
parent a90c522da9
commit d26d505f81
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2008-03-14 Tambet Ingo <tambet@gmail.com>
* src/NetworkManagerPolicy.c (auto_activate_device): Don't leak device and
data.
2008-03-14 Dan Williams <dcbw@redhat.com> 2008-03-14 Dan Williams <dcbw@redhat.com>
* include/wireless-helper.h * include/wireless-helper.h

7
src/NetworkManagerPolicy.c
View File

@@ -190,7 +190,7 @@ auto_activate_device (gpointer user_data)
// deactivate the device and activate the new connection instead of just // deactivate the device and activate the new connection instead of just
// bailing if the device is already active // bailing if the device is already active
if (nm_device_get_act_request (data->device)) if (nm_device_get_act_request (data->device))
return FALSE; goto out;
policy = data->policy; policy = data->policy;
@@ -233,12 +233,13 @@ auto_activate_device (gpointer user_data)
/* Remove this call's handler ID */ /* Remove this call's handler ID */
policy->pending_activation_checks = g_slist_remove (policy->pending_activation_checks, data); policy->pending_activation_checks = g_slist_remove (policy->pending_activation_checks, data);
g_object_unref (data->device);
g_slist_foreach (connections, (GFunc) g_object_unref, NULL); g_slist_foreach (connections, (GFunc) g_object_unref, NULL);
g_slist_free (connections); g_slist_free (connections);
out:
g_object_unref (data->device);
g_free (data); g_free (data);
return FALSE; return FALSE;
} }