diff options
| author | Hui Peng <phui@google.com> | 2023-04-27 01:06:18 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-17 19:37:59 +0000 |
| commit | 6d0920941866a17ba917bfb9153a38283afd88fb (patch) | |
| tree | 3b0c15bd760f0c22697ad9d18e7399c5f0412bb3 | |
| parent | dbdfc897043b195490c2d5cdf51d676b35224447 (diff) | |
| download | bt-6d0920941866a17ba917bfb9153a38283afd88fb.tar.gz | |
Fix a type confusion bug in bta_av_setconfig_rej
This is a backport of I78a1ee50dea0113381e51f8521711d758dc759cf
to rvc-dev.
Bug: 260230151
Test: manual
Ignore-AOSP-First: security
Tag: #security
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7a801d1556be1d07975fbcc0f0692c033eab8c15)
Merged-In: I78a1ee50dea0113381e51f8521711d758dc759cf
Change-Id: I78a1ee50dea0113381e51f8521711d758dc759cf
| -rw-r--r-- | bta/av/bta_av_aact.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bta/av/bta_av_aact.cc b/bta/av/bta_av_aact.cc index 29dcea07b..4bb26fd41 100644 --- a/bta/av/bta_av_aact.cc +++ b/bta/av/bta_av_aact.cc @@ -1798,14 +1798,13 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { ******************************************************************************/ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { tBTA_AV_REJECT reject; - uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle; - bta_av_adjust_seps_idx(p_scb, avdt_handle); + bta_av_adjust_seps_idx(p_scb, p_scb->avdt_handle); LOG_DEBUG(LOG_TAG, "%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__, p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl); AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0); - reject.bd_addr = p_data->str_msg.bd_addr; + reject.bd_addr = p_scb->PeerAddress(); reject.hndl = p_scb->hndl; tBTA_AV bta_av_data; |