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

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

am 3cce4937: Merge "Fix benign overflow in SampleIterator" 

* commit '3cce4937':
  Fix benign overflow in SampleIterator
parents 3b938b6c 3cce4937

media/libstagefright/SampleIterator.cpp

+7 −0
Original line number Diff line number Diff line
@@ -166,6 +166,13 @@ status_t SampleIterator::findChunkRange(uint32_t sampleIndex) { 
        if (mSampleToChunkIndex + 1 < mTable->mNumSampleToChunkOffsets) {

            mStopChunk = entry[1].startChunk;



            if (mStopChunk < mFirstChunk ||

                (mStopChunk - mFirstChunk) > UINT32_MAX / mSamplesPerChunk ||

                ((mStopChunk - mFirstChunk) * mSamplesPerChunk >

                 UINT32_MAX - mFirstChunkSampleIndex)) {



                return ERROR_OUT_OF_RANGE;

            }

            mStopChunkSampleIndex =

                mFirstChunkSampleIndex

                    + (mStopChunk - mFirstChunk) * mSamplesPerChunk;