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

Commit 7e2d436f authored by Joshua J. Drake's avatar Joshua J. Drake Committed by Android Git Automerger
Browse files

am 06880580: am 9784b406: am 49029189: am 30b72fcf: am 0773dc37: am 768a8fb4:... 

am 06880580: am 9784b406: am 49029189: am 30b72fcf: am 0773dc37: am 768a8fb4: am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing

* commit '06880580':
  Fix integer underflow in covr MPEG4 processing
parents 3056e554 06880580

media/libstagefright/MPEG4Extractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1938,6 +1938,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                    return ERROR_IO;

                }

                const int kSkipBytesOfDataBox = 16;

                if (chunk_data_size <= kSkipBytesOfDataBox) {

                    return ERROR_MALFORMED;

                }



                mFileMetaData->setData(

                    kKeyAlbumArt, MetaData::TYPE_NONE,

                    buffer->data() + kSkipBytesOfDataBox, chunk_data_size - kSkipBytesOfDataBox);