Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b4a75f3 authored by Marco Nelissen's avatar Marco Nelissen Committed by Tim Schumacher
Browse files

Skip track if verification fails 

Bug: 62187433
Test: ran poc, CTS
(cherry picked from commit ef8c7830)

Change-Id: I0388df5da15e216a5e4619de43f905e65caed082
parent de069341

media/libstagefright/MPEG4Extractor.cpp

+12 −6
Original line number Diff line number Diff line
@@ -909,6 +909,12 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                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('s', 't', 'b', 'l')) {

                ALOGV("sampleTable chunk is %d bytes long.", (size_t)chunk_size);
@@ -975,6 +981,12 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                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;
@@ -992,12 +1004,6 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 


                    return OK;

                }



                status_t err = verifyTrack(mLastTrack);



                if (err != OK) {

                    return err;

                }

            } else if (chunk_type == FOURCC('m', 'o', 'o', 'v')) {

                mInitCheck = OK;