commit b0ed640b15b57b7262a34e549e76d44db5b155db
author Marco Nelissen <marcone@google.com> Mon Sep 11 08:44:20 2017 -0700
committer Marco Nelissen <marcone@google.com> Mon Sep 11 08:44:20 2017 -0700
tree fbc52b4271e3f07c04b3511287612975cc99b927
parent 768a06e9f3d8ab701ff35d010d5615c18ab2d5cb

Fix potential divide by zero

Bug: 36197669
Change-Id: Ia0221b4b64049b182bcff6526f34111c896f2f03

media/libstagefright/SampleIterator.cpp

diff --git a/media/libstagefright/SampleIterator.cpp b/media/libstagefright/SampleIterator.cpp
index 4f31c5f..75f744d 100644
--- a/media/libstagefright/SampleIterator.cpp
+++ b/media/libstagefright/SampleIterator.cpp
@@ -172,7 +172,7 @@
         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)) {