| commit | 33d1c4edbc4e3a3d770a708e4bcfed56be56825f | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Mar 07 04:08:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 07 04:08:19 2017 +0000 |
| tree | ddf97dbcce71b340a07eba0cdcc2bb74daabf967 | |
| parent | d66179fac873eb1ba597a08746854cbf273a230b [diff] | |
| parent | 5dfade5b09d9af90f8ebcbf9bd426f5fba417dc3 [diff] |
Merge "Guard against sample time overflow" am: 7639616e4f am: 5dfade5b09 Change-Id: Ied4068d43807308aaf74dbe7e9aca30359c2b68e
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 5ce2b76..93cd275 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; + } } }