Merge "Fix potential divide by zero"

7 years ago · 3540a9e51b
parent 768a06e9f3 b0ed640b15
commit 3540a9e51b
1 changed files with 1 additions and 1 deletions
--- a/media/libstagefright/SampleIterator.cpp
+++ b/media/libstagefright/SampleIterator.cpp
@ -172,7 +172,7 @@ status_t SampleIterator::findChunkRange(uint32_t sampleIndex) {
        if (mSampleToChunkIndex + 1 < mTable->mNumSampleToChunkOffsets) {
            mStopChunk = entry[1].startChunk;

-            if (mStopChunk < mFirstChunk ||
+            if (mSamplesPerChunk == 0 || mStopChunk < mFirstChunk ||
                (mStopChunk - mFirstChunk) > UINT32_MAX / mSamplesPerChunk ||
                ((mStopChunk - mFirstChunk) * mSamplesPerChunk >
                 UINT32_MAX - mFirstChunkSampleIndex)) {