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

Commit 0c9e64b3 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android Git Automerger
Browse files

am 4a3bb67a: am 73dd4321: Merge "Whitelist updatePCR from fsanitize=integer" 

* commit '4a3bb67a':
  Whitelist updatePCR from fsanitize=integer
parents 7e7a4e32 4a3bb67a

media/libstagefright/mpeg2ts/ATSParser.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1537,6 +1537,7 @@ bool ATSParser::PTSTimeDeltaEstablished() { 
    return mPrograms.editItemAt(0)->PTSTimeDeltaEstablished();

}



__attribute__((no_sanitize("integer")))

void ATSParser::updatePCR(

        unsigned /* PID */, uint64_t PCR, size_t byteOffsetFromStart) {

    ALOGV("PCR 0x%016" PRIx64 " @ %zu", PCR, byteOffsetFromStart);
@@ -1555,6 +1556,7 @@ void ATSParser::updatePCR( 
    ++mNumPCRs;



    if (mNumPCRs == 2) {

        /* Unsigned overflow here */

        double transportRate =

            (mPCRBytes[1] - mPCRBytes[0]) * 27E6 / (mPCR[1] - mPCR[0]);