mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: guard against transports without sco_io

Browse source 
If backend releases transport early and sco_io becomes NULL, don't
access it.

Also guard against calloc failing in sco_io creation.
This commit is contained in:
Pauli Virtanen 2021-03-20 12:18:13 +02:00 • committed by Wim Taymans
parent 79e098bdf2
commit 0385d0a07e
4 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/bluez5/sco-sink.c
View file

@ -332,7 +332,7 @@ static void flush_data(struct impl *this)
uint32_t min_in_size;
uint8_t *packet;
if (this->transport == NULL)
if (this->transport == NULL || this->transport->sco_io == NULL)
return;
/* get buffer */
@ -560,7 +560,8 @@ static int do_start(struct impl *this)
spa_return_val_if_fail(this->transport->write_mtu <= sizeof(this->port.write_buffer), -EINVAL);
/* start socket i/o */
spa_bt_transport_ensure_sco_io(this->transport, this->data_loop);
if ((res = spa_bt_transport_ensure_sco_io(this->transport, this->data_loop)) < 0)
goto fail;
/* Add the timeout callback */
this->source.data = this;
@ -577,6 +578,12 @@ static int do_start(struct impl *this)
this->started = true;
return 0;
fail:
free(this->buffer);
this->buffer = NULL;
spa_bt_transport_release(this->transport);
return res;
}
/* Drop any buffered data remaining in the port */