From 70214d0273948044cd2d09cd93d1ca84a13c1d73 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 12 Dec 2025 12:26:04 +0100 Subject: [PATCH 1/2] initialze st->element_brate per default --- lib_com/options.h | 1 + lib_dec/ivas_sce_dec.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 59daf40a86..71ad0661bd 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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_1484_CLANG18_MSAN_INIT_ST_ELEM_BRATE /* FhG: initialize st->element_brate per default */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c index 148b584872..11240eefe9 100644 --- a/lib_dec/ivas_sce_dec.c +++ b/lib_dec/ivas_sce_dec.c @@ -368,6 +368,9 @@ ivas_error create_sce_dec( copy_decoder_config( st_ivas, st ); st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ +#ifdef FIX_1484_CLANG18_MSAN_INIT_ST_ELEM_BRATE + st->element_brate = 0; +#endif st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; st->is_ism_format = 0; if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) -- GitLab From 12c91359ff3767c63a666bb5ebac5ad277fbad62 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 15 Dec 2025 12:02:09 +0100 Subject: [PATCH 2/2] initialize element_brate to explicitly invalid value --- lib_dec/ivas_sce_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c index 11240eefe9..8bbe0f421c 100644 --- a/lib_dec/ivas_sce_dec.c +++ b/lib_dec/ivas_sce_dec.c @@ -369,7 +369,7 @@ ivas_error create_sce_dec( st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ #ifdef FIX_1484_CLANG18_MSAN_INIT_ST_ELEM_BRATE - st->element_brate = 0; + st->element_brate = -1; #endif st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; st->is_ism_format = 0; -- GitLab