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

fix USAN OOB index complaint

parent 867217ee

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_2274_OOB_INDEXING_IN_CORRMATRIX             /* FhG: fix OOB indexing complaint */



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

lib_enc/enc_acelp.c

+7 −0
Original line number Diff line number Diff line
@@ -492,7 +492,14 @@ static void E_ACELP_corrmatrix( 
        p3 = &rrixiy[2][pos];

        p2 = &rrixiy[1][pos];

        p1 = &rrixiy[0][pos];

#ifdef FIX_2274_OOB_INDEXING_IN_CORRMATRIX

        p0 = &rrixiy[3][pos];

        /* decrement pointer instead of indexing the array to avoid CLANG Usan complaint */

        /* for last loop iteration, this points to rrixiy[3][-1], but is not actually accessed in later loop (k = 15 then, so inner loop will not run) */

        p0 -= 16;

#else

        p0 = &rrixiy[3][pos - 16];

#endif



        cor = 0.0F;

        ptr_h1 = h;