Commit cefdba2e authored by Adam Mills's avatar Adam Mills
Browse files

Merge branch '698-MSAN-use-of-uninitialized-value-in-SBA-rate-switching' into 'main' 

Fixing MSAN issue in SBA decoder

See merge request !965
parents b38826b0 b9683bef

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -5079,7 +5079,8 @@ void ivas_copy_band_coeffs_idx_to_arr( 


void ivas_clear_band_coeffs( 

    ivas_band_coeffs_t *pband_coeffs, 

    const uint16_t num_bands 

    const uint16_t num_bands,

    const uint16_t num_ts

);



void ivas_clear_band_coeff_idx(

lib_com/ivas_spar_com_quant_util.c

+13 −9
Original line number Diff line number Diff line
@@ -293,19 +293,23 @@ void ivas_copy_band_coeffs_idx_to_arr( 


void ivas_clear_band_coeffs(

    ivas_band_coeffs_t *pband_coeffs,

    const uint16_t num_bands )

    const uint16_t num_bands,

    const uint16_t num_ts )

{

    uint16_t i;

    uint16_t i, j;



    for ( j = 0; j < num_ts; j++ )

    {

        for ( i = 0; i < num_bands; i++ )

        {

        set_zero( (float *) pband_coeffs[i].C_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) * ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );

        set_zero( (float *) pband_coeffs[i].P_re, ( IVAS_SPAR_MAX_CH - 1 ) );

        set_zero( (float *) pband_coeffs[i].C_quant_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) * ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );

        set_zero( (float *) pband_coeffs[i].P_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );

        set_zero( pband_coeffs[i].pred_re, ( IVAS_SPAR_MAX_CH - 1 ) );

            set_zero( (float *) pband_coeffs[i + j * num_bands].C_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) * ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );

            set_zero( (float *) pband_coeffs[i + j * num_bands].P_re, ( IVAS_SPAR_MAX_CH - 1 ) );

            set_zero( (float *) pband_coeffs[i + j * num_bands].C_quant_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) * ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );

            set_zero( (float *) pband_coeffs[i + j * num_bands].P_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );

            set_zero( pband_coeffs[i + j * num_bands].pred_re, ( IVAS_SPAR_MAX_CH - 1 ) );



        set_zero( pband_coeffs[i].pred_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );

            set_zero( pband_coeffs[i + j * num_bands].pred_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );

        }

    }



    return;

lib_dec/ivas_spar_md_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ ivas_error ivas_spar_md_dec_init( 
)

{

    int16_t i, j;

    int16_t nchan_transport;

    int16_t nchan_transport, num_md_sub_frames;

    float pFC[IVAS_MAX_NUM_BANDS], PR_minmax[2];



    ivas_sba_get_spar_hoa_md_flag( sba_order, hDecoderConfig->ivas_total_brate, &hMdDec->spar_hoa_md_flag, &hMdDec->spar_hoa_dirac2spar_md_flag );
@@ -541,7 +541,9 @@ ivas_error ivas_spar_md_dec_init( 
    hMdDec->spar_plc_enable_fadeout_flag = 1;

    hMdDec->dtx_md_smoothing_cntr = 1;



    ivas_clear_band_coeffs( hMdDec->spar_md.band_coeffs, IVAS_MAX_NUM_BANDS );

    num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order, hDecoderConfig->ivas_total_brate, hDecoderConfig->ivas_total_brate );



    ivas_clear_band_coeffs( hMdDec->spar_md.band_coeffs, IVAS_MAX_NUM_BANDS, num_md_sub_frames );

    ivas_clear_band_coeff_idx( hMdDec->spar_md.band_coeffs_idx, IVAS_MAX_NUM_BANDS );

    ivas_clear_band_coeff_idx( hMdDec->spar_md_prev.band_coeffs_idx, IVAS_MAX_NUM_BANDS );

    ivas_clear_band_coeff_idx( hMdDec->spar_md_prev.band_coeffs_idx_mapped, IVAS_MAX_NUM_BANDS );

lib_enc/ivas_spar_md_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ ivas_error ivas_spar_md_enc_init( 
        }

    }



    ivas_clear_band_coeffs( hMdEnc->spar_md.band_coeffs, IVAS_MAX_NUM_BANDS );

    ivas_clear_band_coeffs( hMdEnc->spar_md.band_coeffs, IVAS_MAX_NUM_BANDS, 1 );

    ivas_clear_band_coeff_idx( hMdEnc->spar_md.band_coeffs_idx, IVAS_MAX_NUM_BANDS );

    ivas_clear_band_coeff_idx( hMdEnc->spar_md_prior.band_coeffs_idx, IVAS_MAX_NUM_BANDS );

    ivas_clear_band_coeff_idx( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, IVAS_MAX_NUM_BANDS );