commit 1ad278b5d67e00ecaade3d2680102ea05041af43
author Eric Laurent <elaurent@google.com> Fri Mar 05 18:09:01 2021 +0100
committer Eric Laurent <elaurent@google.com> Sun Mar 07 17:58:16 2021 +0100
tree 959f005606f7bd13755d97177700e9417c8a506e
parent 5faae759e2b6ec8c3018022078d924a8d376bb06

mediautils : TimeCheck: fix OOB access

Fix OOB access when reading from audioHalPids
in TimeCheck::accessAudioHalPids()

Bug: 175894436
Test: make
Change-Id: I436523e4909051f83fc916effbe2710d2d962168

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