system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-10-14 11:53:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluez5: don't crash if validate_config fails

Browse source 
transport->device_link has to be set when transport->device is not NULL
This commit is contained in:
Pauli Virtanen 2021-01-08 22:26:46 +02:00 committed by Wim Taymans
parent cbea225abd
commit 7ca568db86
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -1187,6 +1187,13 @@ static DBusHandlerResult endpoint_set_configuration(DBusConnection *conn,
transport->a2dp_codec = codec;
transport_update_props(transport, &it[1], NULL);
if (transport->device == NULL) {
spa_log_warn(monitor->log, "no device found for transport");
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
if (is_new)
spa_list_append(&transport->device->transport_list, &transport->device_link);
if (codec->validate_config) {
struct spa_audio_info info;
if (codec->validate_config(codec, 0,
@ -1206,13 +1213,6 @@ static DBusHandlerResult endpoint_set_configuration(DBusConnection *conn,
spa_log_info(monitor->log, "%p: %s validate conf channels:%d",
monitor, path, transport->n_channels);
if (transport->device == NULL) {
spa_log_warn(monitor->log, "no device found for transport");
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
if (is_new)
spa_list_append(&transport->device->transport_list, &transport->device_link);
spa_bt_device_connect_profile(transport->device, transport->profile);
if ((r = dbus_message_new_method_return(m)) == NULL)