Commit 039c9ce6 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch... 

Merge branch 'basop-2323-clang18-msan-use-of-uninitialized-value-in-lib_enc-ivas_dirac_enc_fx-c-1590-30' into 'main'

Resolve "[CLANG18] MSAN: use-of-uninitialized-value in lib_enc/ivas_dirac_enc_fx.c:1590:30"

Closes #2323

See merge request !2731
parents 76c1d7a6 b52ecbd0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

#define FIX_2334_HARM_CODER_MODIF                       /* VA: basop issue 2334 : harmonizing coder_modif_function */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */

#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */



/* #################### End BE switches ################################## */

lib_enc/ivas_dirac_enc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1574,9 +1574,17 @@ void computeDiffuseness_mdft_fx( 
    set_zero_fx( intensity_slow, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );

    set16_fx( intensity_slow_e, 0, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );

    set_zero_fx( intensity_slow_abs, MASA_FREQUENCY_BANDS );

#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT

    set16_fx( intensity_slow_abs_e, 0, MASA_FREQUENCY_BANDS );

#else

    set16_fx( intensity_slow_abs_e, 0, no_col_avg_diff );

#endif

    set_zero_fx( energy_slow, MASA_FREQUENCY_BANDS );

#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT

    set16_fx( energy_slow_e, 0, MASA_FREQUENCY_BANDS );

#else

    set16_fx( energy_slow_e, 0, no_col_avg_diff );

#endif



    FOR( i = 0; i < no_col_avg_diff; ++i )

    {