Commit 382b377d authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2459-usan-use-of-uninitialized-value-in-lib_dec-hf_synth_fx-c-1065-9' into 'main'

Resolve "USAN: use-of-uninitialized-value in lib_dec/hf_synth_fx.c:1065:9"

Closes #2459

See merge request !2850
parents f87905f0 28171002

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
#define FIX_2424_REMOVE_GAUSS_L2_ENC                    /* VA: basop issue 2424: Remove duplicated code in gauss_L2_ivas_fx() */

#define FIX_MDCT_STEREO_ENC_STACK                       /* VA: basop issue 2428: Move IGF temporary buffers out of the highest stack */

#define HARMONIZE_TBE3                                  /* VA: basop issue 2399: Remove duplicated code: TBE, step 3 */

#define FIX_2459_USAN_AMR_SIDSTART                      /* FhG: basop issue 2459: fix msan complaint */



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

lib_dec/hf_synth_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -994,6 +994,14 @@ void hf_synth_amr_wb_fx( 
            move16(); /* qdct */

            pt1++;

        }

#ifdef FIX_2459_USAN_AMR_SIDSTART



        /* initialize to fix MSAN complaint - array is never actually accessed in this case */

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

        {

            HF_corr_gain[i] = 32767; /* one in Q15 */

        }

#endif

    }



    q_tmp = Exp16Array( L_FRAME16k, dct_hb );