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

Commit 940189d9 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4... 

am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev

* commit '475de998':
  Fix integer overflow during MP4 atom processing
parents 520434cd 475de998

media/libstagefright/SampleTable.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -230,6 +230,9 @@ status_t SampleTable::setSampleToChunkParams( 
        return ERROR_MALFORMED;

        return ERROR_MALFORMED;

    }

    }





    if (SIZE_MAX / sizeof(SampleToChunkEntry) <= mNumSampleToChunkOffsets)

        return ERROR_OUT_OF_RANGE;



    mSampleToChunkEntries =

    mSampleToChunkEntries =

        new SampleToChunkEntry[mNumSampleToChunkOffsets];

        new SampleToChunkEntry[mNumSampleToChunkOffsets];