Commit 8f2faed9 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch... 

Merge branch 'basop-2324-clang18-msan-use-of-uninitialized-value-in-lib_enc-ivas_mcmasa_enc_fx-c-1325-78' into 'main'

Resolve "[CLANG18] MSAN: use-of-uninitialized-value in lib_enc/ivas_mcmasa_enc_fx.c:1325:78"

Closes #2324

See merge request !2729
parents 039c9ce6 16955c7c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#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 */

#define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */



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

lib_enc/ivas_mcmasa_enc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1021,6 +1021,14 @@ void ivas_mcmasa_param_est_enc_fx( 
            move32();

            hMcMasa->direction_vector_m_fx[2][block_m_idx][band_m_idx] = 0;

            move32();

#ifdef FIX_BASOP_2324_MISSING_SET_TO_ZERO

            hMcMasa->direction_vector_e[0][block_m_idx][band_m_idx] = 0;

            move16();

            hMcMasa->direction_vector_e[1][block_m_idx][band_m_idx] = 0;

            move16();

            hMcMasa->direction_vector_e[2][block_m_idx][band_m_idx] = 0;

            move16();

#endif

        }



        /* Reset variable */