Commit d2574125 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch 'float-1532-clang18-msan-use-of-uninitialized-value-in-lib_dec-hf_synth-c-470-9' into 'main'

Resolve "[CLANG18] MSAN: use-of-uninitialized-value in lib_dec/hf_synth.c:470:9"

See merge request !2536
parents addf7742 f70a8d9c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define FIX_2235_TD_RENDERER_WORD16                     /* Eri: For float: small synch with BASOP, removing unnecessary abs. BASOP: Use Word16 in TD renderer without converting to Word32 */

#define FIX_FLOAT_1526_DIRAC_MEM_LEAK                   /* FhG: potential memory leak in DirAC handles in case of format switching */

#define ALIGN_ACELP_CORE                                /* VA: align ACELP core functions with BASOP */

#define FIX_1532_MSAN_ERR_AMR_FIRST_FRAME_IS_SID        /* FhG: fix msan complaint in AMR-WB when first frame is an SID */



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

lib_dec/hf_synth.c

+10 −0
Original line number Diff line number Diff line
@@ -441,6 +441,16 @@ void hf_synth_amr_wb( 
            HF_corr_gain[i] = 2 * HP_gain[hf_gain[i]];

        }

    }

#ifdef FIX_1532_MSAN_ERR_AMR_FIRST_FRAME_IS_SID

    else

    {

        /* Initialize to fix clang-18 sanitizer complaint */

        for ( i = 0; i < NB_SUBFR; ++i )

        {

            HF_corr_gain[i] = 1.0f;

        }

    }

#endif



    /* inverse DCT transform of HF excitation */

    set_f( exc16k, 0.0f, L_FRAME16k );