Commit 1a8e253b authored by norvell's avatar norvell
Browse files

Merge branch... 

Merge branch 'float-1483-clang18-msan-use-of-uninitialized-value-in-lib_enc-peak_vq_enc-c-268-5' into 'main'

Add fix FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR to address MSAN error - basop

See merge request !2676
parents 0795f2db acff15de

lib_com/hvq_pvq_bitalloc_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ Word16 hvq_pvq_bitalloc_fx( 
    UWord16 lsb;

    Word16 num_sfm;



#ifdef FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR

    *n_sel_bands = 0;

    move16();

#endif



    IF( EQ_16( bwidth_fx, FB ) )

    {

        num_sfm = SFM_N_HARM_FB;
@@ -107,8 +112,10 @@ Word16 hvq_pvq_bitalloc_fx( 
        return 0;

    }



#ifndef FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR

    *n_sel_bands = 0;

    move16();

#endif

    envSum = 0;

    move16();

    E_max = L_deposit_l( 0 );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
#define FIX_2268_OOB_INDEXING_IN_IFFT                   /* VA: Fix for issue 2268, to silence clang18 */

#define FIX_2271_OOB_INDEXING_IN_PIT_OL2                /* VA: Fix for issue 2271, to silence clang18 */

#define FIX_2273_OOB_INDEXING_IN_PIT_FR4                /* VA: Fix to silence clang on ptr init */

#define FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR                 /* Eri: When no PVQ bands are selected in peaq_vq_enc, the number of bands is not initialized. */

#define FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE           /* Eri: Initializes a variables in HQ decoder. It is not used, but is passed uninitialized to a function which is caught by clang-18 */

#define FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR    /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */

#define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR              /* Dolby: Remove unused psNoiseGen from ISAR */