From 2f0f07a7559c1758c9470c2fd5127fe7d1f362c0 Mon Sep 17 00:00:00 2001 From: Mikel Astiz Date: Tue, 19 Feb 2013 16:12:50 +0100 Subject: [PATCH] bluetooth: Fix assertion failure if BlueZ crashes during GetProperties If BlueZ crashes exactly while PulseAudio waits for the GetProperties reply, the device has already been removed from the hashmap and therefore an assertion failure is experienced. The solution consists of ignoring the reply in these cases. The problem can be observed in the following traces: D: [pulseaudio] bluetooth-util.c: Bluetooth daemon appeared. D: [pulseaudio] bluetooth-util.c: dbus: interface=org.bluez.Manager, path=/, member=AdapterAdded D: [pulseaudio] bluetooth-util.c: Adapter /org/bluez/497/hci1 created D: [pulseaudio] bluetooth-util.c: Registering /MediaEndpoint/HFPAG on adapter /org/bluez/497/hci1. D: [pulseaudio] bluetooth-util.c: Registering /MediaEndpoint/HFPHS on adapter /org/bluez/497/hci1. D: [pulseaudio] bluetooth-util.c: Registering /MediaEndpoint/A2DPSource on adapter /org/bluez/497/hci1. D: [pulseaudio] bluetooth-util.c: Registering /MediaEndpoint/A2DPSink on adapter /org/bluez/497/hci1. D: [pulseaudio] bluetooth-util.c: dbus: interface=org.bluez.Adapter, path=/org/bluez/497/hci1, member=DeviceCreated D: [pulseaudio] bluetooth-util.c: Device /org/bluez/497/hci1/dev_90_84_0D_B2_C7_04 created D: [pulseaudio] bluetooth-util.c: dbus: interface=org.freedesktop.DBus, path=/org/freedesktop/DBus, member=NameOwnerChanged D: [pulseaudio] bluetooth-util.c: Bluetooth daemon disappeared. E: [pulseaudio] bluetooth-util.c: Assertion 'p->call_data == d' failed at modules/bluetooth/bluetooth-util.c:685, function get_properties_reply(). Aborting. --- src/modules/bluetooth/bluetooth-util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 688fee02c..0fd8b85d2 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -679,8 +679,10 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) { if (dbus_message_has_interface(p->message, "org.bluez.Manager") || dbus_message_has_interface(p->message, "org.bluez.Adapter")) d = NULL; - else - d = pa_hashmap_get(y->devices, dbus_message_get_path(p->message)); + else if (!(d = pa_hashmap_get(y->devices, dbus_message_get_path(p->message)))) { + pa_log_warn("Received GetProperties() reply from unknown device: %s (device removed?)", dbus_message_get_path(p->message)); + goto finish2; + } pa_assert(p->call_data == d);