Commit 3971ebf7 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2331-clang18-msan-use-of-uninitialized-value-in-lib_rend-lib_rend_fx-c-7035-37' into 'main'

Resolve "[CLANG18] MSAN: use-of-uninitialized-value in lib_rend/lib_rend_fx.c:7035:37"

Closes #2331

See merge request !2712
parents 828a5479 cc3d3952

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#define FIX_BASOP_2332_ASAN_OVERFLOW_IN_EXT_DIRAC_REND  /* Nokia: basop issue 2332: Uses predefined memory sizes instead computing wrong */

#define FIX_BASOP_2333_MCMASA_ANA_MEMORY_LEAK           /* Nokia: basop issue 2333: Add missing free for direction_vector_e to ivas_mcmasa_ana_fx.c */

#define HARM_COREDECODER_FUNCTIONS                      /* VA: basop issue 2347: Remove various duplicated code in core-decoder  */

#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */



/* #################### End BE switches ################################## */

lib_rend/lib_rend_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -6928,6 +6928,10 @@ static ivas_error renderIsmToSba( 
    error = IVAS_ERR_OK;

    move32();



#ifdef FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE

    set32_fx( currentPanGains_fx, 0, MAX_OUTPUT_CHANNELS );

#endif



    ismInput->currentPos.azimuth_fx = L_shl( L_shr( L_add( ismInput->currentPos.azimuth_fx, ONE_IN_Q21 ), Q22 ), Q22 );

    ismInput->currentPos.elevation_fx = L_shl( L_shr( L_add( ismInput->currentPos.elevation_fx, ONE_IN_Q21 ), Q22 ), Q22 );

    ismInput->previousPos.azimuth_fx = L_shl( L_shr( L_add( ismInput->previousPos.azimuth_fx, ONE_IN_Q21 ), Q22 ), Q22 );