mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Protect from a misbehaving bluetoothd

Browse source 
bluetoothd always send the GetManagedObjects() reply messages with the
objects array argument following an in-depth order starting from the
root. That means parents will always be known at the time their children
objects are parsed, if clients parse the objects in the same order they
appear in the array, as we do in PulseAudio.

This commit tries to protect PulseAudio in the case bluetoothd changes
that behavior for some reason. It hasn't been tested, since this
situation never occurs.
This commit is contained in:
João Paulo Rechi Vita 2013-09-24 19:45:36 -03:00 • committed by Tanu Kaskinen
parent 89e97215c7
commit 82fd8cc845
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/bluetooth/bluez5-util.c
View file

@ -489,11 +489,13 @@ static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bo
return; return;
} }
if (d->adapter) { if (d->adapter_path) {
pa_log_warn("Device %s: Received a duplicate 'Adapter' property, ignoring", d->path); pa_log_warn("Device %s: Received a duplicate 'Adapter' property, ignoring", d->path);
return; return;
} }
d->adapter_path = pa_xstrdup(value);
d->adapter = pa_hashmap_get(d->discovery->adapters, value); d->adapter = pa_hashmap_get(d->discovery->adapters, value);
if (!d->adapter) if (!d->adapter)
pa_log_info("Device %s: 'Adapter' property references an unknown adapter %s.", d->path, value); pa_log_info("Device %s: 'Adapter' property references an unknown adapter %s.", d->path, value);
@ -561,7 +563,7 @@ static int parse_device_properties(pa_bluetooth_device *d, DBusMessageIter *i, b
dbus_message_iter_next(&element_i); dbus_message_iter_next(&element_i);
} }
if (!d->address || !d->adapter || !d->alias) { if (!d->address || !d->adapter_path || !d->alias) {
pa_log_error("Non-optional information missing for device %s", d->path); pa_log_error("Non-optional information missing for device %s", d->path);
d->device_info_valid = -1; d->device_info_valid = -1;
return -1; return -1;
@ -685,6 +687,7 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessageIter *dict_i) { static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessageIter *dict_i) {
DBusMessageIter element_i; DBusMessageIter element_i;
const char *path; const char *path;
void *state;
pa_bluetooth_device *d; pa_bluetooth_device *d;
pa_assert(dbus_message_iter_get_arg_type(dict_i) == DBUS_TYPE_OBJECT_PATH); pa_assert(dbus_message_iter_get_arg_type(dict_i) == DBUS_TYPE_OBJECT_PATH);
@ -745,6 +748,15 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
dbus_message_iter_next(&element_i); dbus_message_iter_next(&element_i);
} }
PA_HASHMAP_FOREACH(d, y->devices, state)
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);
d->device_info_valid = -1;
}
}
return; return;
} }

1
src/modules/bluetooth/bluez5-util.h
View file

@ -80,6 +80,7 @@ struct pa_bluetooth_device {
/* Device information */ /* Device information */
char *path; char *path;
char *adapter_path;
char *alias; char *alias;
char *address; char *address;
uint32_t class_of_device; uint32_t class_of_device;