From af0c45386faa8828c5b682211673265d677f376d Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 18 Dec 2012 08:47:58 +0200 Subject: [PATCH] bluetooth: Don't access a transport after it's freed. In addition to moving the freeing a bit later, unnecessary checks for t->device are removed. t->device is initialized to a non-NULL value when the transport is created, and it's never changed. --- src/modules/bluetooth/bluetooth-util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 392f4a5..61c52f5 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -1388,17 +1388,18 @@ static DBusMessage *endpoint_clear_configuration(DBusConnection *c, DBusMessage } if ((t = pa_hashmap_get(y->transports, path))) { - bool old_any_connected = t->device ? pa_bluetooth_device_any_audio_connected(t->device) : false; + bool old_any_connected = pa_bluetooth_device_any_audio_connected(t->device); pa_log_debug("Clearing transport %s profile %d", t->path, t->profile); t->device->transports[t->profile] = NULL; pa_hashmap_remove(y->transports, t->path); t->state = PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED; pa_hook_fire(&y->hooks[PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED], t); - transport_free(t); - if (t->device && old_any_connected != pa_bluetooth_device_any_audio_connected(t->device)) + if (old_any_connected != pa_bluetooth_device_any_audio_connected(t->device)) run_callback(t->device, FALSE); + + transport_free(t); } pa_assert_se(r = dbus_message_new_method_return(m)); -- 2.7.4