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

platform: fix check_cache_items() to check items in two steps

Browse source 
check_cache_items() iterated over all items and called refresh_object().
But refresh_object() might remove the current object from the cache, so
this would break the iteration.

Instead check the items in two steps. First find all the objects we care
about and build a list of them. Then check them.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-05-29 10:50:45 +02:00
parent 68bd8711d2
commit 90ab7e83ff
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/platform/nm-linux-platform.c
View file

@ -1278,12 +1278,20 @@ check_cache_items (NMPlatform *platform, struct nl_cache *cache, int ifindex)
{
auto_nl_cache struct nl_cache *cloned_cache = nl_cache_clone (cache);
struct nl_object *object;
GPtrArray *objects_to_refresh = g_ptr_array_new_with_free_func ((GDestroyNotify) nl_object_put);
guint i;
for (object = nl_cache_get_first (cloned_cache); object; object = nl_cache_get_next (object)) {
g_assert (nl_object_get_cache (object) == cloned_cache);
if (object_has_ifindex (object, ifindex))
refresh_object (platform, object, TRUE, NM_PLATFORM_REASON_CACHE_CHECK);
if (object_has_ifindex (object, ifindex)) {
nl_object_get (object);
g_ptr_array_add (objects_to_refresh, object);
}
}
for (i = 0; i < objects_to_refresh->len; i++)
refresh_object (platform, object, TRUE, NM_PLATFORM_REASON_CACHE_CHECK);
g_ptr_array_free (objects_to_refresh, TRUE);
}
static void