diff --git a/lib_com/options.h b/lib_com/options.h index de58cbabd78771d230e958b9b2ed6e026086fb9d..53d0a8681d0448fd66f55718657d69bd11f5a3e0 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -173,6 +173,7 @@ #define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */ #define FIX_2271_OOB_INDEXING_IN_PIT_OL2 /* VA: Fix for issue 2271, to silence clang18 */ #define FIX_2273_OOB_INDEXING_IN_PIT_FR4 /* VA: Fix to silence clang on ptr init */ +#define FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE /* Eri: Initializes two variables in HQ decoder. They are not used, but they are passed uninitialized to a function which is caught by clang-18 */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/hq_hr_dec.c b/lib_dec/hq_hr_dec.c index 165d52f6b0d7a080c91a864f2611b0cc7972fe46..9055a9e2e3927d3da7078bc6411576f7d9a8b5f8 100644 --- a/lib_dec/hq_hr_dec.c +++ b/lib_dec/hq_hr_dec.c @@ -137,6 +137,9 @@ void hq_hr_dec( HQ_DEC_HANDLE hHQ_core = st->hHQ_core; bits_left = num_bits; +#ifdef FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE + hq_generic_offset = 0; +#endif /*------------------------------------------------------------------* * Initializations