commit 659cb35e192201158837ccf89efb2cea603e7fab
author Marco Nelissen <marcone@google.com> Wed Feb 08 22:16:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 08 22:16:59 2017 +0000
tree d93ccb95cd3bc900202dd6c27563ded4631ae82a
parent 94388e4b6353e5712d236feeb4029be74577213d
parent bbc0c8bb5478ee59970977033802185cccf10b48

Merge "Fix divide by zero"

media/libstagefright/SampleIterator.cpp

diff --git a/media/libstagefright/SampleIterator.cpp b/media/libstagefright/SampleIterator.cpp
index 8ddf7f3..4134698 100644
--- a/media/libstagefright/SampleIterator.cpp
+++ b/media/libstagefright/SampleIterator.cpp
@@ -313,7 +313,7 @@
             break;
         }
         if (mTimeToSampleIndex == mTable->mTimeToSampleCount ||
-            mTTSCount > UINT32_MAX / mTTSDuration ||
+            (mTTSDuration != 0 && mTTSCount > UINT32_MAX / mTTSDuration) ||
             mTTSSampleTime > UINT32_MAX - (mTTSCount * mTTSDuration)) {
             return ERROR_OUT_OF_RANGE;
         }