fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 02:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: fix clearing weak-ref in platform_link_added()

Browse source 
We must always clear the weak-ref.

Fixes: 4dbaac4ba2
This commit is contained in:
Thomas Haller 2015-12-04 14:11:00 +01:00
parent 153aba0662
commit 01a644a05b
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/nm-manager.c
View file

@ -2007,39 +2007,42 @@ static gboolean
_platform_link_cb_idle (PlatformLinkCbData *data)
{
NMManager *self = data->self;
const NMPlatformLink *l;
if (self) {
const NMPlatformLink *l;
if (!self)
goto out;
l = nm_platform_link_get (NM_PLATFORM_GET, data->ifindex);
if (l) {
NMPlatformLink pllink;
g_object_remove_weak_pointer (G_OBJECT (self), (gpointer *) &data->self);
pllink = *l; /* make a copy of the link instance */
platform_link_added (self, data->ifindex, &pllink);
} else {
NMDevice *device;
GError *error = NULL;
l = nm_platform_link_get (NM_PLATFORM_GET, data->ifindex);
if (l) {
NMPlatformLink pllink;
device = nm_manager_get_device_by_ifindex (self, data->ifindex);
if (device) {
if (nm_device_is_software (device)) {
/* Software devices stick around until their connection is removed */
if (!nm_device_unrealize (device, FALSE, &error)) {
nm_log_warn (LOGD_DEVICE, "(%s): failed to unrealize: %s",
nm_device_get_iface (device),
error->message);
g_clear_error (&error);
remove_device (self, device, FALSE, TRUE);
}
} else {
/* Hardware devices always get removed when their kernel link is gone */
pllink = *l; /* make a copy of the link instance */
platform_link_added (self, data->ifindex, &pllink);
} else {
NMDevice *device;
GError *error = NULL;
device = nm_manager_get_device_by_ifindex (self, data->ifindex);
if (device) {
if (nm_device_is_software (device)) {
/* Software devices stick around until their connection is removed */
if (!nm_device_unrealize (device, FALSE, &error)) {
nm_log_warn (LOGD_DEVICE, "(%s): failed to unrealize: %s",
nm_device_get_iface (device),
error->message);
g_clear_error (&error);
remove_device (self, device, FALSE, TRUE);
}
} else {
/* Hardware devices always get removed when their kernel link is gone */
remove_device (self, device, FALSE, TRUE);
}
g_object_remove_weak_pointer (G_OBJECT (self), (gpointer *) &data->self);
}
}
out:
g_slice_free (PlatformLinkCbData, data);
return G_SOURCE_REMOVE;
}