| commit | 6fe7d5973c89e27652521e4d4af46deca557d2a3 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Feb 08 22:24:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 08 22:24:35 2017 +0000 |
| tree | b504209d818a52a2725deacf2a9535515895babc | |
| parent | 2ab6368f1c78abb7788516f99f8878767335d8be [diff] | |
| parent | 021add2defd199f3b07d41ab0a29364f3a638a47 [diff] |
Merge "Fix divide by zero" am: 659cb35e19 am: 021add2def Change-Id: Id633e8581b39e62615489981427380a80361d741
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; }