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

Commit 02052ff3 authored by Ivan Lozano's avatar Ivan Lozano Committed by Gerrit Code Review
Browse files

Merge "Fix integer sanitizer in FastMixerDumpState."

parents 8d21f0ae deef1856

services/audioflinger/FastMixerDumpState.cpp

+6 −1
Original line number Diff line number Diff line
@@ -78,7 +78,12 @@ void FastMixerDumpState::dump(int fd) const 
    uint32_t bounds = mBounds;

    uint32_t newestOpen = bounds & 0xFFFF;

    uint32_t oldestClosed = bounds >> 16;

    uint32_t n = (newestOpen - oldestClosed) & 0xFFFF;



    //uint32_t n = (newestOpen - oldestClosed) & 0xFFFF;

    uint32_t n;

    __builtin_sub_overflow(newestOpen, oldestClosed, &n);

    n = n & 0xFFFF;



    if (n > mSamplingN) {

        ALOGE("too many samples %u", n);

        n = mSamplingN;