From 7d9ac373bff7cd88c2d69a8fe7a2240746650aa1 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 16 Dec 2025 17:09:45 +0100 Subject: [PATCH 1/2] initialize nb_bits_metadata to zero --- lib_com/options.h | 1 + lib_dec/ivas_jbm_dec.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index fb505d58f4..24531cc271 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -170,6 +170,7 @@ #define FIX_2274_OOB_INDEXING_IN_CORRMATRIX /* FhG: fix OOB indexing complaint */ #define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */ #define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */ +#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX /* FhG: init nb_bits_metadata to zero */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 4f0acd6364..c7b3cf90a6 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -101,6 +101,10 @@ ivas_error ivas_jbm_dec_tc( } } +#ifdef FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX + set_s( nb_bits_metadata, 0, MAX_SCE + 1 ); +#endif + /*----------------------------------------------------------------* * Decoding + pre-rendering *----------------------------------------------------------------*/ -- GitLab From 4fe177b0a45d4c9c15c3ce643a7e6b929a1eb8b1 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 17 Dec 2025 11:07:28 +0100 Subject: [PATCH 2/2] zero out the buffer at place where it is handled --- lib_com/options.h | 2 +- lib_dec/ivas_ism_dtx_dec.c | 6 ++++++ lib_dec/ivas_jbm_dec.c | 4 ---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 24531cc271..728cd426cb 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -170,7 +170,7 @@ #define FIX_2274_OOB_INDEXING_IN_CORRMATRIX /* FhG: fix OOB indexing complaint */ #define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */ #define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */ -#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX /* FhG: init nb_bits_metadata to zero */ +#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX /* FhG/VA: init nb_bits_metadata to zero */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec.c index 3164218b41..dc0b27813b 100644 --- a/lib_dec/ivas_ism_dtx_dec.c +++ b/lib_dec/ivas_ism_dtx_dec.c @@ -120,6 +120,12 @@ void ivas_ism_dtx_dec( nb_bits_metadata[ch] = nb_bits_metadata[sce_id_dtx]; } } +#ifdef FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX + else + { + set_s( nb_bits_metadata, 0, st_ivas->nchan_transport ); + } +#endif if ( !st_ivas->bfi ) { diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index c7b3cf90a6..4f0acd6364 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -101,10 +101,6 @@ ivas_error ivas_jbm_dec_tc( } } -#ifdef FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX - set_s( nb_bits_metadata, 0, MAX_SCE + 1 ); -#endif - /*----------------------------------------------------------------* * Decoding + pre-rendering *----------------------------------------------------------------*/ -- GitLab