commit e2f869fc4b750181f7f02a43ec58b03783727440
author Dongwon Kang <dwkang@google.com> Thu Aug 03 21:15:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 21:15:00 2017 +0000
tree 2371ec856595af183275bb9388570573162081e0
parent 909f4a6cada3d5fb7594da7d1809ba62d1b47340
parent 168cbf6cabc0e0411715b95d748e785f2351d9e6

Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e am: 995ffd91a4 am: 464af3dc2e am: e7aba4ca81 am: 962ea2d280 am: 852e902636 am: 3a8976ce36
am: 168cbf6cab

Change-Id: Id59a53dbb3f917b047de090e19ec840c2c4c272b

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 941c759..459a1cb 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -941,6 +941,12 @@
                 ALOGE("moov: depth %d", depth);
                 return ERROR_MALFORMED;
             }
+
+            if (chunk_type == FOURCC('m', 'o', 'o', 'v') && mInitCheck == OK) {
+                ALOGE("duplicate moov");
+                return ERROR_MALFORMED;
+            }
+
             if (chunk_type == FOURCC('m', 'o', 'o', 'f') && !mMoofFound) {
                 // store the offset of the first segment
                 mMoofFound = true;
@@ -1014,6 +1020,12 @@
                 if (!mLastTrack->meta->findInt32(kKeyTrackID, &trackId)) {
                     mLastTrack->skipTrack = true;
                 }
+
+                status_t err = verifyTrack(mLastTrack);
+                if (err != OK) {
+                    mLastTrack->skipTrack = true;
+                }
+
                 if (mLastTrack->skipTrack) {
                     Track *cur = mFirstTrack;
 
@@ -1033,12 +1045,6 @@
 
                     return OK;
                 }
-
-                status_t err = verifyTrack(mLastTrack);
-
-                if (err != OK) {
-                    return err;
-                }
             } else if (chunk_type == FOURCC('m', 'o', 'o', 'v')) {
                 mInitCheck = OK;