commit 77a5123b2aa9cb27919b17e4da26bc7281e14943
author Marco Nelissen <marcone@google.com> Wed Feb 08 22:26:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 08 22:26:35 2017 +0000
tree 564822f651406580d74a990d3d355dd212470f54
parent 4bc99bcd453559938d85b7f559b119d7dd46a9ba
parent 6fe7d5973c89e27652521e4d4af46deca557d2a3

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

Change-Id: I05b15bf43fb31d9de3560ca1ccfe0c93f29fcf8f

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