| commit | 17d791ad76d6c33201e5953483a0770380d42572 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Mar 07 04:10:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 07 04:10:52 2017 +0000 |
| tree | 83c45888cd9b486039052c99e8b555a8a9f86205 | |
| parent | 6d616e69c42fc7e692ca3770c6a1f3d573deb6ce [diff] | |
| parent | 33d1c4edbc4e3a3d770a708e4bcfed56be56825f [diff] |
Merge "Guard against sample time overflow" am: 7639616e4f am: 5dfade5b09 am: 33d1c4edbc Change-Id: I7cb4bfd82c1882d53177aba82dd7849c21692dd6
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index de5ea9c..1d2a931 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp
@@ -701,7 +701,13 @@ } ++sampleIndex; - sampleTime += delta; + if (sampleTime > UINT32_MAX - delta) { + ALOGE("%u + %u would overflow, clamping", + sampleTime, delta); + sampleTime = UINT32_MAX; + } else { + sampleTime += delta; + } } }