From d8fb09b56726e626086f8d44e9221c9129b4fa36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Date: Wed, 20 Nov 2013 18:21:35 -0300 Subject: [PATCH] bluetooth: Check adapter address to set device_info_valid If the adapter object has no address information the device information should be marked as invalid. --- src/modules/bluetooth/bluez5-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c index c8ff21993..d2893c0a8 100644 --- a/src/modules/bluetooth/bluez5-util.c +++ b/src/modules/bluetooth/bluez5-util.c @@ -820,8 +820,8 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa if (!d->adapter && d->adapter_path) { d->adapter = pa_hashmap_get(d->discovery->adapters, d->adapter_path); - if (!d->adapter) { - pa_log_error("Device %s is child of nonexistent adapter %s", d->path, d->adapter_path); + if (!d->adapter || !d->adapter->address) { + pa_log_error("Device %s is child of nonexistent or corrupted adapter %s", d->path, d->adapter_path); set_device_info_valid(d, -1); } else set_device_info_valid(d, 1);