Commit 833d34a3 authored by norvell's avatar norvell
Browse files

Merge branch 'basop-2317-msan-use-of-uninitialized-value-in-masa-dtx-encoding' into 'main' 

[Non-BE] Resolve: MSAN: use-of-uninitialized-value in MASA DTX encoding - basop

See merge request !2750
parents 187213dc 0603217a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
#define FIX_1500_ISM_MD_DTX                             /* VA: float issue 1500: fix ISM elevation metadata smoothing in DTX */

#define FIX_2348_REPLACE_FEC_ENC                        /* VA: basop issue 2348: replace FEC_encode_ivas_fx with FEC_encode_fx  */

#define FIX_2338_HARM_GSC_GAIN_COMP                     /* VA: basop issue 2338: harmonization of band gain computation for both EVS and IVAS */

#define FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG       /* Eri: Basop issue 2317: Uninitialized value read in case of DTX and BW switching   */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_stereo_dft_enc_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -3953,10 +3953,16 @@ static void stereo_dft_enc_compute_prm_fx( 
     * Compute Side gains

     *-----------------------------------------------------------------*/



#ifdef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG

    Copy32( pSideGain, hStereoDft->sidSideGain_fx, STEREO_DFT_BAND_MAX ); /* Copy all sideGain values since BW change may be reverted during CNG */

#endif



    FOR( b = 0; b < hStereoDft->nbands; b++ )

    {

#ifndef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG

        hStereoDft->sidSideGain_fx[b] = *( pSideGain + b );

        move32();

#endif



        /* Quantization */

        IF( flag_quant )