diff options
| author | Dmitriy Paliy <dmitriy.paliy@nokia.com> | 2011-02-17 11:31:17 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2011-02-17 15:34:26 -0300 |
| commit | 4c07eae01d5fc6f80f88d27bbcaa2effe73ef325 (patch) | |
| tree | 683f46f9bb424d19c80e2cf2bc24fbca9275468b /audio | |
| parent | 4d21e85715580f468c7f190a3cd25d7fadaba9aa (diff) | |
| download | bluez-4c07eae01d5fc6f80f88d27bbcaa2effe73ef325.tar.gz | |
Fix no SEP if corresponding interface is disabled
A2DP sink endpoint shall not be created if A2DP sink interface is disabled.
Same holds for A2DP source endpoint and A2DP source interface.
Such fixes bluetoothd crash when SDP record is registered and remote
device tries to connect and stream to A2DP sink which is not initialized.
Dereferencing of NULL happens in source_new_stream since device->source
was not created.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/a2dp.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/audio/a2dp.c b/audio/a2dp.c index 012fce8b..3407d6fe 100644 --- a/audio/a2dp.c +++ b/audio/a2dp.c @@ -110,6 +110,8 @@ struct a2dp_server { uint32_t source_record_id; uint32_t sink_record_id; uint16_t version; + gboolean sink_enabled; + gboolean source_enabled; }; static GSList *servers = NULL; @@ -1480,6 +1482,7 @@ proceed: else server->version = 0x0102; + server->source_enabled = source; if (source) { for (i = 0; i < sbc_srcs; i++) a2dp_add_sep(src, AVDTP_SEP_TYPE_SOURCE, @@ -1489,7 +1492,7 @@ proceed: a2dp_add_sep(src, AVDTP_SEP_TYPE_SOURCE, A2DP_CODEC_MPEG12, delay_reporting, NULL); } - + server->sink_enabled = sink; if (sink) { for (i = 0; i < sbc_sinks; i++) a2dp_add_sep(src, AVDTP_SEP_TYPE_SINK, @@ -1551,6 +1554,12 @@ struct a2dp_sep *a2dp_add_sep(const bdaddr_t *src, uint8_t type, if (server == NULL) return NULL; + if (type == AVDTP_SEP_TYPE_SINK && !server->sink_enabled) + return NULL; + + if (type == AVDTP_SEP_TYPE_SOURCE && !server->source_enabled) + return NULL; + sep = g_new0(struct a2dp_sep, 1); if (endpoint) { |