commit 97138efc1dd9529302d927c7d835acfc5cf4332f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 27 02:40:39 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 27 02:40:39 2024 +0000
tree 6e54aa83f935b7d48bfeb1af1e69366d9366446e
parent 2849210893bb3e243a7eaf21ee5a90e5c88ba0ee
parent f1aaf95082318b82ecf83c09ed07fd95ddf592ab

Merge "MPEG4Writer: Fix unsigned integer overflow" into main

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 15188b0..76b6aa6 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -3776,6 +3776,12 @@
             if (mStszTableEntries->count() == 0) {
                 mFirstSampleTimeRealUs = systemTime() / 1000;
                 if (timestampUs < 0 && mFirstSampleStartOffsetUs == 0) {
+                    if (WARN_UNLESS(timestampUs != INT64_MIN, "for %s track", trackName)) {
+                        copy->release();
+                        mSource->stop();
+                        mIsMalformed = true;
+                        break;
+                    }
                     mFirstSampleStartOffsetUs = -timestampUs;
                     timestampUs = 0;
                 }