Commit ec3d2e41 authored by vaclav's avatar vaclav
Browse files

FIX_2392_MSAN_DESTROY_DEC

parent cf7f073c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 
#define FIX_2391_INIT_HQ_GENERIC_OFFSET                 /* FhG/Eri: basop issue 2391: make sure hq_generic_offset is initialized inside hq_hr_dec_fx() */

#define FIX_2397_COPY_AQ_MDCT_CORE_BFI                  /* FhG: prevent copying of uninit memory in MDCT stereo core if bfi is set */

#define HARMONIZE_TBE                                   /* VA: harmonize core-coder TBE function duplications */

#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();