Commit 1938d8ab authored by multrus's avatar multrus
Browse files

Merge branch '2077_basop_portFltMr2266' into 'main' 

Port Flt MR 2066 to main - [MSAN Clang 18] use-of-uninitialized value in ivas_mdct_core_invQ

Closes #2077

See merge request !2336
parents 3d0122a2 bf01c32d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

#define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mdct_core_dec_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -699,6 +699,9 @@ void ivas_mdct_core_invQ_fx( 
    set16_fx( bitsRead, 0, CPE_CHANNELS );

    tmp_concealment_method = 0;

    move16();

#ifdef FIX_1387_INIT_PRM_SQQ

    prm_sqQ = NULL; /* set prm_sqQ to NULL - in case of bfi == 1 it's not set or needed, but it triggers sanitizers */

#endif



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

    {