diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-09 10:01:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-09 10:01:52 +0000 |
| commit | fe4cb2de15d6e3b679e7f22fbce5237ab6bf1565 (patch) | |
| tree | d54739110efeb742c1df6f1ec20fd554b9d667b6 | |
| parent | 2d174cc2740257726122d4dc1fa9c7ec2b958c51 (diff) | |
| parent | 1ad278b5d67e00ecaade3d2680102ea05041af43 (diff) | |
Merge "mediautils : TimeCheck: fix OOB access" into rvc-qpr-dev
| -rw-r--r-- | media/utils/TimeCheck.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/utils/TimeCheck.cpp b/media/utils/TimeCheck.cpp index 59d74de942..819e1468ea 100644 --- a/media/utils/TimeCheck.cpp +++ b/media/utils/TimeCheck.cpp @@ -39,10 +39,9 @@ void TimeCheck::accessAudioHalPids(std::vector<pid_t>* pids, bool update) { static std::atomic<int> curAudioHalPids = 0; if (update) { - audioHalPids[(curAudioHalPids + 1) % kNumAudioHalPidsVectors] = *pids; - curAudioHalPids++; + audioHalPids[(curAudioHalPids++ + 1) % kNumAudioHalPidsVectors] = *pids; } else { - *pids = audioHalPids[curAudioHalPids]; + *pids = audioHalPids[curAudioHalPids % kNumAudioHalPidsVectors]; } } |