diff options
| author | Richard Smith <happyercat@gmail.com> | 2021-02-22 14:25:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-14 21:57:38 +0000 |
| commit | 94468870262471420a44fc5107af663c3c08c955 (patch) | |
| tree | 37f20c912d66df0be4b9da793a726ffbcf2363c0 | |
| parent | 267820fd1bb2bf10bb02c0643ed0ef6e8592d8a4 (diff) | |
| download | bt-94468870262471420a44fc5107af663c3c08c955.tar.gz | |
Fix memory overflow.
Bug: 180939982
Merged-In: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
Change-Id: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
(cherry picked from commit 0d93359dbbe99da62528b236ba4a9ab92f06c6af)
| -rw-r--r-- | stack/btm/btm_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc index 694577d0e..090a0aafc 100644 --- a/stack/btm/btm_acl.cc +++ b/stack/btm/btm_acl.cc @@ -1611,7 +1611,7 @@ bool BTM_TryAllocateSCN(uint8_t scn) { /* Make sure we don't exceed max port range. * Stack reserves scn 1 for HFP, HSP we still do the correct way. */ - if ((scn >= BTM_MAX_SCN) || (scn == 1)) return false; + if ((scn >= BTM_MAX_SCN) || (scn == 1) || (scn == 0)) return false; /* check if this port is available */ if (!btm_cb.btm_scn[scn - 1]) { @@ -1633,7 +1633,7 @@ bool BTM_TryAllocateSCN(uint8_t scn) { ******************************************************************************/ bool BTM_FreeSCN(uint8_t scn) { BTM_TRACE_DEBUG("BTM_FreeSCN "); - if (scn <= BTM_MAX_SCN) { + if (scn <= BTM_MAX_SCN && scn > 0) { btm_cb.btm_scn[scn - 1] = false; return (true); } else { |