commit fe4cb2de15d6e3b679e7f22fbce5237ab6bf1565
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 09 10:01:52 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 09 10:01:52 2021 +0000
tree d54739110efeb742c1df6f1ec20fd554b9d667b6
parent 2d174cc2740257726122d4dc1fa9c7ec2b958c51
parent 1ad278b5d67e00ecaade3d2680102ea05041af43

Merge "mediautils : TimeCheck: fix OOB access" into rvc-qpr-dev

media/utils/TimeCheck.cpp

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];
     }
 }