commit 80fe08ba70741191cb1928e2458931b670284c9e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 13 05:13:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 13 05:13:30 2022 +0000
tree 3b6a1d1de997a458d67b48ef80ef384be8b18476
parent 334d96eef6decd8c43813da9c3ebd5d2c1220be6
parent 0b6094963cc1901f0c3f77b206cb72a1622e86a0

Merge "Fix integer overflow in MPEG4Extractor"

media/module/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/module/extractors/mp4/MPEG4Extractor.cpp b/media/module/extractors/mp4/MPEG4Extractor.cpp
index 2e889e3..8f8fc1b 100644
--- a/media/module/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/module/extractors/mp4/MPEG4Extractor.cpp
@@ -6723,7 +6723,7 @@
         const Sample *smpl = &mCurrentSamples[mCurrentSampleIndex];
         offset = smpl->offset;
         size = smpl->size;
-        cts = mCurrentTime + smpl->compositionOffset;
+        cts = (int64_t)mCurrentTime + (int64_t)smpl->compositionOffset;
 
         if (mElstInitialEmptyEditTicks > 0) {
             cts += mElstInitialEmptyEditTicks;