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

Commit 66bf5dc2 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix potential divide by zero" am: 3540a9e5 

am: f97cf1b9

Change-Id: I826ec65090b730fbb3cfcb0ac8a7d0675d01617d
parents 8d5d4fc3 f97cf1b9

media/libstagefright/SampleIterator.cpp

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

        if (mSampleToChunkIndex + 1 < mTable->mNumSampleToChunkOffsets) {

            mStopChunk = entry[1].startChunk;

            mStopChunk = entry[1].startChunk;





            if (mStopChunk < mFirstChunk ||

            if (mSamplesPerChunk == 0 || mStopChunk < mFirstChunk ||

                (mStopChunk - mFirstChunk) > UINT32_MAX / mSamplesPerChunk ||

                (mStopChunk - mFirstChunk) > UINT32_MAX / mSamplesPerChunk ||

                ((mStopChunk - mFirstChunk) * mSamplesPerChunk >

                ((mStopChunk - mFirstChunk) * mSamplesPerChunk >

                 UINT32_MAX - mFirstChunkSampleIndex)) {

                 UINT32_MAX - mFirstChunkSampleIndex)) {