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

Commit e1b943f2 authored by Hangyu Kuang's avatar Hangyu Kuang
Browse files

media: Limit the maximum size of per-frame metadata. 

Test: Manual test.

Bug: 28536560
Change-Id: I6557ead64a33de308266ac23c0f8f793d01a369a
parent 25adc33c

media/libstagefright/MPEG4Writer.cpp

+11 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static const int64_t kMax32BitFileSize = 0x00ffffffffLL; // 2^32-1 : max FAT32 
static const uint8_t kNalUnitTypeSeqParamSet = 0x07;

static const uint8_t kNalUnitTypePicParamSet = 0x08;

static const int64_t kInitialDelayTimeUs     = 700000LL;

static const int64_t kMaxMetadataSize = 0x4000000LL;   // 64MB max per-frame metadata size



static const char kMetaKey_Version[]    = "com.android.version";

#ifdef SHOW_MODEL_BUILD
@@ -2457,6 +2458,16 @@ status_t MPEG4Writer::Track::threadEntry() { 
            continue;

        }



        // Per-frame metadata sample's size must be smaller than max allowed.

        if (!mIsVideo && !mIsAudio && buffer->range_length() >= kMaxMetadataSize) {

            ALOGW("Buffer size is %zu. Maximum metadata buffer size is %lld for %s track",

                    buffer->range_length(), (long long)kMaxMetadataSize, trackName);

            buffer->release();

            mSource->stop();

            mIsMalformed = true;

            break;

        }



        ++nActualFrames;



        // Make a deep copy of the MediaBuffer and Metadata and release