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

Commit 2076df09 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android (Google) Code Review
Browse files

Merge "A2DP: Protect against division-by-zero error in bitpool calculation" into lmp-dev

parents 39d355c8 0df2c6ed

system/btif/src/btif_media_task.c

+11 −1
Original line number Diff line number Diff line
@@ -1874,7 +1874,7 @@ static void btif_media_task_enc_update(BT_HDR *p_msg) 
    tBTIF_MEDIA_UPDATE_AUDIO * pUpdateAudio = (tBTIF_MEDIA_UPDATE_AUDIO *) p_msg;

    SBC_ENC_PARAMS *pstrEncParams = &btif_media_cb.encoder;

    UINT16 s16SamplingFreq;

    SINT16 s16BitPool;

    SINT16 s16BitPool = 0;

    SINT16 s16BitRate;

    SINT16 s16FrameLen;

    UINT8 protect = 0;
@@ -1904,6 +1904,16 @@ static void btif_media_task_enc_update(BT_HDR *p_msg) 


        do

        {

            if (pstrEncParams->s16NumOfBlocks == 0 || pstrEncParams->s16NumOfSubBands == 0

                || pstrEncParams->s16NumOfChannels == 0)

            {

                APPL_TRACE_ERROR("btif_media_task_enc_update() - Avoiding division by zero...");

                APPL_TRACE_ERROR("btif_media_task_enc_update() - block=%d, subBands=%d, channels=%d",

                    pstrEncParams->s16NumOfBlocks, pstrEncParams->s16NumOfSubBands,

                    pstrEncParams->s16NumOfChannels);

                break;

            }



            if ((pstrEncParams->s16ChannelMode == SBC_JOINT_STEREO) ||

                (pstrEncParams->s16ChannelMode == SBC_STEREO) )

            {