commit f86534bea2eefe0935d8cfa7b97b75b789e608eb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 27 02:56:27 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 27 02:56:27 2024 +0000
tree ebc83fc23cf96ea22fdc8d8e8831a6cc4723a07d
parent 692ecc045ee6428f5ec589ac590a1d33aeb03de9
parent 8d5d1952ef9f65595a77adb9380e4945e8963881

Merge "MPEG4Writer: Fix unsigned integer overflow" into main am: 97138efc1d am: 8d5d1952ef

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3236960

Change-Id: Ia3d8a797e0af318ded581bcd7a1b260bdfb54bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
                 }