Commit 244fba7c authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch 'basop-2392-clang18-msan-use-of-uninitialized-value-in-use-of-uninitialized-value-in' into 'main'

Resolve "[CLANG18] MSAN: use-of-uninitialized-value in use-of-uninitialized-value in ivas_destroy_dec_fx"

Closes #2392

See merge request !2796
parents 1e268e41 2f70a563

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#define FIX_2403_COMBINE_PITCH_OL                       /* VA : basop 2403, reusing common code between EVS and IVAS in pitch_ol */

#define FIX_2404_HARM_SIGNAL_CLAS                       /* VA: basop-2404, harmonize signal_clas and signa_ivas_clas */

#define HARMONIZE_ACELP_ENC                             /* VA: basop issue 2400: Remove duplicated main ACELP encoder function */

#define FIX_2392_MSAN_DESTROY_DEC                       /* VA: basop issue 2392: fix MSAN in ivas_destroy_dec_fx() */



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

lib_dec/lib_dec_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -337,6 +337,9 @@ static void init_decoder_config( 
)

{

    hDecoderConfig->Opt_AMR_WB = 0;

#ifdef FIX_2392_MSAN_DESTROY_DEC

    hDecoderConfig->output_Fs = -1;

#endif

    hDecoderConfig->nchan_out = 1;

    hDecoderConfig->output_config = IVAS_AUDIO_CONFIG_INVALID;

    hDecoderConfig->Opt_LsCustom = 0;
@@ -354,6 +357,9 @@ static void init_decoder_config( 
    hDecoderConfig->Opt_aeid_on = 0;

    hDecoderConfig->Opt_ObjEdit_on = 0;

    move16();

#ifdef FIX_2392_MSAN_DESTROY_DEC

    move32();

#endif

    move16();

    move16();

    move16();