commit 89a5055187864ae8bf8d5ee4f2cb2719f4d1054b
author Marco Nelissen <marcone@google.com> Wed Feb 08 22:44:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 08 22:44:00 2017 +0000
tree 0267b8b074fe6233148b74d06c5440951b6c1bda
parent 395d1a36e38f3dd100368cc89226870be3508d7a
parent 77a5123b2aa9cb27919b17e4da26bc7281e14943

Merge "Fix divide by zero" am: 659cb35e19 am: 021add2def am: 6fe7d5973c
am: 77a5123b2a

Change-Id: Id75e62379acbce548ee099abb3134e6c964a9939

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