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

Commit e00d020b authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix overflow check so it doesn\'t reject legitimate files" am: 7534cb3a 

am: 7e150264

* commit '7e150264':
  Fix overflow check so it doesn't reject legitimate files
parents bf24de29 7e150264

media/libstagefright/SampleTable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ status_t SampleTable::setSampleToChunkParams( 
    for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {

        uint8_t buffer[12];



        if ((off64_t)((SIZE_MAX / 12) - 8 - i) < mSampleToChunkOffset) {

        if ((off64_t)(SIZE_MAX - 8 - (i * 12)) < mSampleToChunkOffset) {

            return ERROR_MALFORMED;

        }