Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d988df3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mediautils : TimeCheck: fix OOB access" into rvc-qpr-dev am: fe4cb2de am: 48cbba93 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13773950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida29ba3dc0dc3771d03822335d250d9e242ef9ef
parents a2631db3 48cbba93

media/utils/TimeCheck.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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];

    }

}