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

core: fix memory leak

Browse source 
get_virtual_iface_name() returns an allocated interface name which
we must free; that wasn't being done when attempting to find the
interface for which a virtual interface needs to be created.  Also
throw in a cleanup for the given-device-doesn't-exist case just to
make it clearer when the interface name is freed.
This commit is contained in:
Dan Williams 2013-04-23 14:01:24 -05:00
parent ac6543305e
commit ef151c3f04
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nm-manager.c
View file

@ -2758,6 +2758,7 @@ nm_manager_activate_connection (NMManager *manager,
NMDevice *master_device = NULL;
NMConnection *master_connection = NULL;
NMActiveConnection *master_ac = NULL, *ac = NULL;
gboolean matched;
g_return_val_if_fail (manager != NULL, NULL);
g_return_val_if_fail (connection != NULL, NULL);
@ -2803,13 +2804,15 @@ nm_manager_activate_connection (NMManager *manager,
g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"Failed to determine connection's virtual interface name");
return NULL;
} else if (g_strcmp0 (iface, nm_device_get_ip_iface (device)) != 0) {
}
matched = g_str_equal (iface, nm_device_get_ip_iface (device));
g_free (iface);
if (!matched) {
g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"Device given by path did not match connection's virtual interface name");
g_free (iface);
return NULL;
}
g_free (iface);
}
} else {
/* Virtual connections (VLAN, bond, etc) may not specify a device
@ -2831,6 +2834,7 @@ nm_manager_activate_connection (NMManager *manager,
}
device = find_device_by_ip_iface (manager, iface);
g_free (iface);
if (!device) {
/* Create it */
device = system_create_virtual_device (manager, connection);