Commit 8ab87baa authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2352-clang18-msan-use-of-uninitialized-value-in-lib_com-tools_fx-c-1354-16' into 'main'

Resolve "[CLANG18] MSAN: use-of-uninitialized-value in lib_com/tools_fx.c:1354:16"

Closes #2352

See merge request !2763
parents da660ef1 8d41b30f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
#define FIX_2376_FIX_USAN_PRE_PROC                      /* VA: basop issue 2376: Resolve "USAN: SEGV in ivas_compute_core_buffers_fx() */

#define FIX_2367_REMOVE_CODE_ICBWE                      /* VA: basop issue 2367: Remove IC-BWE obsolete code  */

#define REMOVE_SCALING_SHB_SPEECH                       /* VA: remove unnecessary scaling and 32-bit buffers from ivas_core_enc_fx() */

#define FIX_2352_COPY_AQ_IN_TCX                         /* FhG: basop issue 2352: prevent copying uninitialized values from Aq_fx[][] to Aq_fx_32[][] in TCX */



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

lib_dec/ivas_stereo_mdct_core_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -371,9 +371,17 @@ void stereo_mdct_core_dec_fx( 
        }

    }



#ifdef FIX_2352_COPY_AQ_IN_TCX

    FOR( ch = 0; ch < nChannels; ch++ )

#else

    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )

#endif

    {

#ifdef FIX_2352_COPY_AQ_IN_TCX

        Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], nSubframes[ch] * M, sub( Q16, Q12 ) ); /* Q16 */

#else

        Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], ( NB_SUBFR16k + 1 ) * ( M + 1 ), sub( Q16, Q12 ) ); /* Q16 */

#endif

    }



    /*--------------------------------------------------------------------------------*