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

bluetooth: fix invalid assertion in NMBluezManager:dispose()

Browse source 
We need to first free "priv->bzobjs", which then will unlink all bzobjs
from the lists. The assert needs to go after.

https://bugzilla.redhat.com/show_bug.cgi?id=2028427

Fixes: 4154d9618c ('bluetooth: refactor BlueZ handling and let NMBluezManager cache ObjectManager data')
(cherry picked from commit d5f917e702)
This commit is contained in:
Thomas Haller 2022-01-11 10:10:30 +01:00 • committed by Beniamino Galvani
parent 6074ab1e00
commit fb0fb695ee
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/devices/bluetooth/nm-bluez-manager.c
View file

@ -2852,9 +2852,7 @@ dispose(GObject *object)
* BzDBusObj instances and do necessary cleanup actions (like disconnecting devices
* or deleting panu_connection). */
nm_assert(c_list_is_empty(&priv->network_server_lst_head));
nm_assert(c_list_is_empty(&priv->process_change_lst_head));
nm_assert(priv->process_change_idle_id == 0);
nm_clear_g_source(&priv->process_change_idle_id);
g_atomic_pointer_compare_and_exchange(&nm_bt_vtable_network_server,
&priv->vtable_network_server,
@ -2871,6 +2869,9 @@ dispose(GObject *object)
nm_clear_pointer(&priv->bzobjs, g_hash_table_destroy);
nm_clear_pointer(&priv->conn_data_heads, g_hash_table_destroy);
nm_clear_pointer(&priv->conn_data_elems, g_hash_table_destroy);
nm_assert(c_list_is_empty(&priv->network_server_lst_head));
nm_assert(c_list_is_empty(&priv->process_change_lst_head));
}
static void