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

Commit 370290f4 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when... 

am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit 'bcd5edf9':
  Prevent integer overflow when processing covr MPEG4 atoms
parents 4c855d20 bcd5edf9

media/libstagefright/MPEG4Extractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1929,6 +1929,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
            if (mFileMetaData != NULL) {

                ALOGV("chunk_data_size = %lld and data_offset = %lld",

                        chunk_data_size, data_offset);



                if (chunk_data_size >= SIZE_MAX - 1) {

                    return ERROR_MALFORMED;

                }

                sp<ABuffer> buffer = new ABuffer(chunk_data_size + 1);

                if (mDataSource->readAt(

                    data_offset, buffer->data(), chunk_data_size) != (ssize_t)chunk_data_size) {