From 0c95b20909be1092613303f99897fd13d7bb17c0 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 14 Oct 2025 08:48:24 +0200 Subject: [PATCH 1/2] Add temporary for for Issue 2088 in TEMP_FIX_2088_MSAN_INIT_ERROR --- lib_com/options.h | 2 +- lib_rend/lib_rend.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 53f000e8f..b71de45b3 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,7 +151,7 @@ /* ################### Start FIXES switches ########################### */ - +#define TEMP_FIX_2088_MSAN_INIT_ERROR /* Eri: Temporary fix for Issue 2088 - MSAN error. Will come with later port of JBM+Split rendering update */ /* #################### End FIXES switches ############################ */ diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 07c3d6086..01cb836d9 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -2947,6 +2947,12 @@ ivas_error IVAS_REND_Open( isar_init_split_rend_handles( hIvasRend->splitRendWrapper ); } +#ifdef TEMP_FIX_2088_MSAN_INIT_ERROR + hIvasRend->splitRendEncBuffer.data = NULL; + hIvasRend->splitRendEncBuffer.config.is_cldfb = 0; + hIvasRend->splitRendEncBuffer.config.numChannels = 0; + hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = 0; +#endif for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) { -- GitLab From 35a77e3797f5cb41fdca89413968ff4cd91e96e7 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 14 Oct 2025 09:06:41 +0200 Subject: [PATCH 2/2] Reduce TEMP_FIX_2088_MSAN_INIT_ERROR to include only the single line that is necessary --- lib_rend/lib_rend.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 01cb836d9..23ac4c62a 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -2949,9 +2949,6 @@ ivas_error IVAS_REND_Open( } #ifdef TEMP_FIX_2088_MSAN_INIT_ERROR hIvasRend->splitRendEncBuffer.data = NULL; - hIvasRend->splitRendEncBuffer.config.is_cldfb = 0; - hIvasRend->splitRendEncBuffer.config.numChannels = 0; - hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = 0; #endif for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) -- GitLab