diff options
| author | Mikel Astiz <mikel.astiz.oss@gmail.com> | 2012-04-19 08:58:58 +0200 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2012-04-19 07:41:27 -0500 |
| commit | c9d3ce5c221306622a23566da7ca683ca258107a (patch) | |
| tree | 5b006add0e98f8f2dc42af2508de7576887e59f8 /plugins | |
| parent | d0232dee065d407b63c6730f3e6d0a56129ccfe2 (diff) | |
| download | ofono-c9d3ce5c221306622a23566da7ca683ca258107a.tar.bz2 | |
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().
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/hfp_hf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/hfp_hf.c b/plugins/hfp_hf.c index 48a734a5..c11525e1 100644 --- a/plugins/hfp_hf.c +++ b/plugins/hfp_hf.c @@ -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); |