hfp_hf: Fix modifying hash table while iterating

Calling ofono_remove_modem() while iterating the hash table is not safe
given that it can modify the table in hfp_remove().

A simple way to reproduce the problem is to pair some Bluetooth phones
and remove the Bluetooth adapter, triggering a GLib-CRITICAL assertion.

This patch just removes the update of the hash table inside
hfp_remove(). This can be safe as long as all calls to
ofono_modem_remove() are accompanied by a hash table update. The only
example of this kind right now is hfp_agent_release().
This commit is contained in:
Mikel Astiz 2012-04-19 08:58:58 +02:00 committed by Denis Kenzior
parent d0232dee06
commit c9d3ce5c22
1 changed files with 1 additions and 2 deletions

View File

@ -192,6 +192,7 @@ static DBusMessage *hfp_agent_release(DBusConnection *conn,
g_dbus_unregister_interface(connection, obj_path, HFP_AGENT_INTERFACE);
hfp_data->agent_registered = FALSE;
g_hash_table_remove(modem_hash, hfp_data->handsfree_path);
ofono_modem_remove(modem);
return dbus_message_new_method_return(msg);
@ -366,8 +367,6 @@ static void hfp_remove(struct ofono_modem *modem)
HFP_AGENT_INTERFACE))
hfp_unregister_ofono_handsfree(modem);
g_hash_table_remove(modem_hash, data->handsfree_path);
g_free(data->handsfree_address);
g_free(data->handsfree_path);
g_free(data);