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

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

Limit ogg packet size am: bf928560 am: f349435f am: 086cee9d 

am: b65b0a83

Change-Id: I2faa1a87e934851ee2a4a865e3e3d7084381dac6
parents 6dfbcefe b65b0a83

media/libstagefright/OggExtractor.cpp

+15 −1
Original line number Diff line number Diff line
@@ -491,7 +491,21 @@ status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out, bool conf) { 
            if (buffer != NULL) {

                fullSize += buffer->range_length();

            }

            MediaBuffer *tmp = new MediaBuffer(fullSize);

            if (fullSize > 16 * 1024 * 1024) { // arbitrary limit of 16 MB packet size

                if (buffer != NULL) {

                    buffer->release();

                }

                ALOGE("b/36592202");

                return ERROR_MALFORMED;

            }

            MediaBuffer *tmp = new (std::nothrow) MediaBuffer(fullSize);

            if (tmp == NULL) {

                if (buffer != NULL) {

                    buffer->release();

                }

                ALOGE("b/36592202");

                return ERROR_MALFORMED;

            }

            if (buffer != NULL) {

                memcpy(tmp->data(), buffer->data(), buffer->range_length());

                tmp->set_range(0, buffer->range_length());