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

Commit 003b0ca9 authored by Ramesh Katuri's avatar Ramesh Katuri Committed by Ray Essick
Browse files

DO NOT MERGE SoftXAAC::getXAACStreamInfo never validates mNumChannels against MAX_CHANNEL_COUNT 

Adding check to compare number of channels is always less than max channels

Bug: 78782490
Test: build/boot
Change-Id: I4808ec76e18714765055eaec06c40bd8e0d0393d
parent 6a68fd19

media/libstagefright/codecs/xaacdec/SoftXAAC.cpp

+6 −1
Original line number Diff line number Diff line
@@ -855,6 +855,11 @@ void SoftXAAC::configflushDecode() { 
        err_code = getXAACStreamInfo();

        ALOGV("Found Codec with below config---\nsampFreq %d\nnumChannels %d\npcmWdSz %d\nchannelMask %d\noutputFrameLength %d",

                                    mSampFreq,mNumChannels,mPcmWdSz,mChannelMask,mOutputFrameLength);

        if(mNumChannels > MAX_CHANNEL_COUNT) {

            ALOGE(" No of channels are more than max channels\n");

            mIsCodecInitialized = false;

        }

        else

            mIsCodecInitialized = true;

    }