From c854546d9c44888cacf1f3dc8cc080549ddd05ce Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 25 Sep 2025 12:58:59 +0200 Subject: [PATCH 1/2] issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open(); under FIX_1384_MSAN_ivas_spar_dec_open --- lib_com/options.h | 1 + lib_dec/ivas_init_dec.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 8b761e69b2..03820b55cb 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -165,6 +165,7 @@ #define FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add split rendering support to decoder in VoIP mode */ #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */ #define FIX_1377_HANDLE_ERROR_CODE /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */ +#define FIX_1384_MSAN_ivas_spar_dec_open /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 89416ab404..b5b13dcaf4 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1154,6 +1154,9 @@ ivas_error ivas_init_decoder_front( st_ivas->ism_mode = ISM_MODE_NONE; st_ivas->mc_mode = MC_MODE_NONE; +#ifdef FIX_1384_MSAN_ivas_spar_dec_open + st_ivas->sid_format = -1; +#endif st_ivas->sba_dirac_stereo_flag = 0; /* HRTF binauralization latency in ns */ -- GitLab From c7a29ef04ca97e9820daefd584346219dfd61134 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 25 Sep 2025 13:59:10 +0200 Subject: [PATCH 2/2] introduce define SID_FORMAT_NONE --- lib_com/ivas_cnst.h | 3 +++ lib_dec/ivas_init_dec.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 6163953764..ff0e1972fe 100755 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -229,6 +229,9 @@ typedef enum /* format signaling in SID frames */ #define SID_FORMAT_NBITS 3 /* Bit 0 | Bit 1 | Bit 2 */ /*-------|-------|------ */ +#ifdef FIX_1384_MSAN_ivas_spar_dec_open +#define SID_FORMAT_NONE (-0x1) /* n/a| n/a| n/a*/ +#endif #define SID_DFT_STEREO 0x0 /* 0| 0| 0 */ #define SID_MDCT_STEREO 0x1 /* 1| 0| 0 */ #define SID_ISM 0x2 /* 0| 1| 0 */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index b5b13dcaf4..04b1668bbb 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1155,7 +1155,7 @@ ivas_error ivas_init_decoder_front( st_ivas->mc_mode = MC_MODE_NONE; #ifdef FIX_1384_MSAN_ivas_spar_dec_open - st_ivas->sid_format = -1; + st_ivas->sid_format = SID_FORMAT_NONE; #endif st_ivas->sba_dirac_stereo_flag = 0; -- GitLab