commit 1a39e09fa0571ed73c38b1e879beaf5b9e3919e3
author Marco Nelissen <marcone@google.com> Wed Feb 08 14:03:35 2017 -0800
committer gitbuildkicker <android-build@google.com> Wed Feb 08 14:29:18 2017 -0800
tree 2cfdf7b7b1ecfc5dad24789aff1425d08c96d5d4
parent 090534b58daf4857cac355e5fd0767e7201175dd

Fix divide by zero

Bug: 35136163
Change-Id: If074a1c4d595489f4ff4ffc0b8c381d1bc658447
(cherry picked from commit bbc0c8bb5478ee59970977033802185cccf10b48)

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;
         }