Commit 45ed6971 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"

See merge request !2516
parents 53e94063 c8a33910

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

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



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

lib_dec/lib_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -298,6 +298,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;