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

Commit be19aa4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix potential overflow in WAV extractor" into qt-dev am: ee5995f8 am:... 

Merge "Fix potential overflow in WAV extractor" into qt-dev am: ee5995f8 am: 1bf5a0d4 am: 571c8f87 am: c2d62c90

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12978101

Change-Id: I7bfe68cf5c38562d4c93bf013a0ed0c48ca4b701
parents 071fce57 c2d62c90

media/extractors/wav/WAVExtractor.cpp

+7 −7
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ private: 
    AMediaFormat *mMeta;

    uint16_t mWaveFormat;

    const bool mOutputFloat;

    int32_t mSampleRate;

    int32_t mNumChannels;

    int32_t mBitsPerSample;

    uint32_t mSampleRate;

    uint32_t mNumChannels;

    uint32_t mBitsPerSample;

    off64_t mOffset;

    size_t mSize;

    bool mStarted;
@@ -379,9 +379,9 @@ WAVSource::WAVSource( 
      mOffset(offset),

      mSize(size),

      mStarted(false) {

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_SAMPLE_RATE, &mSampleRate));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_CHANNEL_COUNT, &mNumChannels));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_BITS_PER_SAMPLE, &mBitsPerSample));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_SAMPLE_RATE, (int32_t*) &mSampleRate));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_CHANNEL_COUNT, (int32_t*) &mNumChannels));

    CHECK(AMediaFormat_getInt32(mMeta, AMEDIAFORMAT_KEY_BITS_PER_SAMPLE, (int32_t*) &mBitsPerSample));

}



WAVSource::~WAVSource() {
@@ -472,7 +472,7 @@ media_status_t WAVSource::read( 
    }



    const size_t maxBytesAvailable =

        (mCurrentPos - mOffset >= (off64_t)mSize)

        (mCurrentPos < mOffset || mCurrentPos - mOffset >= (off64_t)mSize)

            ? 0 : mSize - (mCurrentPos - mOffset);



    if (maxBytesToRead > maxBytesAvailable) {