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

core: fix list manipulation when removing multiple slaves

Browse Source 
nm_device_release_one_slave() may change the list head, but the
for loop in nm_device_master_release_slaves() can't handle that.
Use a while loop instead.
This commit is contained in:
Dan Williams
2013-05-15 14:39:16 -05:00
parent 7d12ede07b
commit 4ca885f5e3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/nm-device.c
View File

@@ -1121,12 +1121,12 @@ static void
nm_device_master_release_slaves (NMDevice *self, gboolean failed) nm_device_master_release_slaves (NMDevice *self, gboolean failed)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
GSList *iter;
for (iter = priv->slaves; iter; iter = g_slist_next (iter)) while (priv->slaves) {
nm_device_release_one_slave (self, ((SlaveInfo *) iter->data)->slave, failed); SlaveInfo *info = priv->slaves->data;
g_slist_free (priv->slaves);
priv->slaves = NULL; nm_device_release_one_slave (self, info->slave, failed);
}
} }