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

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

am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b:... 

am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processing

* commit '11c88f66':
  Fix integer underflow in covr MPEG4 processing
parents bcc8e581 11c88f66

media/libstagefright/MPEG4Extractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1682,6 +1682,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);