| commit | 48cbba93072c2907401053844110e12e4c98ebf5 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 09 10:26:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 10:26:36 2021 +0000 |
| tree | d3659ef1770edd792a1859ae214e9fb58bc726fe | |
| parent | c0d6981294c455ca2184696822fd76b24088060d [diff] | |
| parent | fe4cb2de15d6e3b679e7f22fbce5237ab6bf1565 [diff] |
Merge "mediautils : TimeCheck: fix OOB access" into rvc-qpr-dev am: fe4cb2de15 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13773950 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I71127c7a566e4a495152142d5b3bd2812a6981dd
diff --git a/media/utils/TimeCheck.cpp b/media/utils/TimeCheck.cpp index 59d74de..819e146 100644 --- a/media/utils/TimeCheck.cpp +++ b/media/utils/TimeCheck.cpp
@@ -39,10 +39,9 @@ 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]; } }