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

Commit 430475da authored by Nick Kralevich's avatar Nick Kralevich
Browse files

resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp 

Bug: 20923261
Change-Id: I6fe12a7c5768f77454bd0391b07f4c3181607d14
parents 7af634e1 0b3eca88

media/libstagefright/MPEG4Extractor.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,9 @@ 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) {