Commit e41b7d21 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'origin/basop-2324-clang18-msan-use-of-uninitialized-value-in-lib_enc-ivas_mcmasa_enc_fx-c-1325-78' into kiene/test-ubuntu-24_04-runner
parents 2d95f64b cdd71fa4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#define HARM_CORE_SW                                    /* VA: basop issue 2314: Remove duplicated code in the core switching */

#define HARM_PREPROC                                    /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX  */

#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 */