From ec3d2e41f9f3059ab520a0fd2f1ea18615ff29fe Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 5 Feb 2026 09:28:33 +0100 Subject: [PATCH] FIX_2392_MSAN_DESTROY_DEC --- lib_com/options.h | 1 + lib_dec/lib_dec_fx.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 0ea316a82..5214fc70b 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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 ################################## */ diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c index fbd748b84..46f008648 100644 --- a/lib_dec/lib_dec_fx.c +++ b/lib_dec/lib_dec_fx.c @@ -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(); -- GitLab