| commit | bbc0c8bb5478ee59970977033802185cccf10b48 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Feb 08 14:03:35 2017 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Wed Feb 08 14:03:35 2017 -0800 |
| tree | d93ccb95cd3bc900202dd6c27563ded4631ae82a | |
| parent | 94388e4b6353e5712d236feeb4029be74577213d [diff] |
Fix divide by zero Bug: 35136163 Change-Id: If074a1c4d595489f4ff4ffc0b8c381d1bc658447
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; }