korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 08:14:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

audio/transport: Fix runtime error

Browse Source 
This fixes the following error cause by assuming transport->data would
also be a struct bap_transport:

profiles/audio/transport.c:328:16: runtime error: load of value 2, which
is not a valid value for type '_Bool'
This commit is contained in:
Luiz Augusto von Dentz 2024-01-03 15:49:30 -05:00
parent e4764af762
commit 1c321baca7
1 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
profiles/audio/transport.c
View File

@ -93,6 +93,10 @@ struct bap_transport {
struct media_transport_ops {
const char *uuid;
const GDBusPropertyTable *properties;
void (*set_owner)(struct media_transport *transport,
struct media_owner *owner);
void (*remove_owner)(struct media_transport *transport,
struct media_owner *owner);
void *(*init)(struct media_transport *transport, void *stream);
guint (*resume)(struct media_transport *transport,
struct media_owner *owner);
@ -310,10 +314,22 @@ static guint media_transport_suspend(struct media_transport *transport,
return 0;
}
static void transport_bap_remove_owner(struct media_transport *transport,
struct media_owner *owner)
{
struct bap_transport *bap = transport->data;
if (bap && bap->linked) {
struct bt_bap_stream *link;
link = bt_bap_stream_io_get_link(bap->stream);
linked_transport_remove_owner(link, owner);
}
}
static void media_transport_remove_owner(struct media_transport *transport)
{
struct media_owner *owner = transport->owner;
struct bap_transport *bap = transport->data;
if (!transport->owner)
return;
@ -325,12 +341,9 @@ static void media_transport_remove_owner(struct media_transport *transport)
media_request_reply(owner->pending, EIO);
transport->owner = NULL;
if (bap && bap->linked) {
struct bt_bap_stream *link;
link = bt_bap_stream_io_get_link(bap->stream);
linked_transport_remove_owner(link, owner);
}
if (transport->ops && transport->ops->remove_owner)
transport->ops->remove_owner(transport, owner);
if (owner->watch)
g_dbus_remove_watch(btd_get_dbus_connection(), owner->watch);
@ -541,20 +554,27 @@ static void linked_transport_set_owner(void *data, void *user_data)
transport->owner = owner;
}
static void media_transport_set_owner(struct media_transport *transport,
static void transport_bap_set_owner(struct media_transport *transport,
struct media_owner *owner)
{
struct bap_transport *bap = transport->data;
DBG("Transport %s Owner %s", transport->path, owner->name);
transport->owner = owner;
if (bap->linked) {
if (bap && bap->linked) {
struct bt_bap_stream *link;
link = bt_bap_stream_io_get_link(bap->stream);
linked_transport_set_owner(link, owner);
}
}
static void media_transport_set_owner(struct media_transport *transport,
struct media_owner *owner)
{
DBG("Transport %s Owner %s", transport->path, owner->name);
transport->owner = owner;
if (transport->ops && transport->ops->set_owner)
transport->ops->set_owner(transport, owner);
owner->transport = transport;
owner->watch = g_dbus_add_disconnect_watch(btd_get_dbus_connection(),
@ -1688,12 +1708,14 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
return bap;
}
#define TRANSPORT_OPS(_uuid, _props, _init, _resume, _suspend, _cancel, \
_set_state, _get_stream, _get_volume, _set_volume, \
_destroy) \
#define TRANSPORT_OPS(_uuid, _props, _set_owner, _remove_owner, _init, \
_resume, _suspend, _cancel, _set_state, _get_stream, \
_get_volume, _set_volume, _destroy) \
{ \
.uuid = _uuid, \
.properties = _props, \
.set_owner = _set_owner, \
.remove_owner = _remove_owner, \
.init = _init, \
.resume = _resume, \
.suspend = _suspend, \
@ -1706,24 +1728,26 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
}
#define A2DP_OPS(_uuid, _init, _set_volume, _destroy) \
TRANSPORT_OPS(_uuid, transport_a2dp_properties, _init, \
TRANSPORT_OPS(_uuid, transport_a2dp_properties, NULL, NULL, _init, \
transport_a2dp_resume, transport_a2dp_suspend, \
transport_a2dp_cancel, NULL, NULL, \
transport_a2dp_get_volume, _set_volume, \
_destroy)
#define BAP_OPS(_uuid, _props) \
TRANSPORT_OPS(_uuid, _props, transport_bap_init, \
#define BAP_OPS(_uuid, _props, _set_owner, _remove_owner) \
TRANSPORT_OPS(_uuid, _props, _set_owner, _remove_owner,\
transport_bap_init, \
transport_bap_resume, transport_bap_suspend, \
transport_bap_cancel, transport_bap_set_state, \
transport_bap_get_stream, NULL, NULL, \
transport_bap_destroy)
#define BAP_UC_OPS(_uuid) \
BAP_OPS(_uuid, transport_bap_uc_properties)
BAP_OPS(_uuid, transport_bap_uc_properties, \
transport_bap_set_owner, transport_bap_remove_owner)
#define BAP_BC_OPS(_uuid) \
BAP_OPS(_uuid, transport_bap_bc_properties)
BAP_OPS(_uuid, transport_bap_bc_properties, NULL, NULL)
static struct media_transport_ops transport_ops[] = {
A2DP_OPS(A2DP_SOURCE_UUID, transport_a2dp_src_init,