Commit 294fc33b authored by norvell's avatar norvell
Browse files

Merge branch 'float-1474-usan-out-of-bounds-index-in-lib_com-trans_inv-c-841-33' into 'main' 

Add USAN fix under FIX_1474_USAN_TRANS_INV - basop

See merge request !2673
parents 1a8e253b 8be795b0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
#define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */

#define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE       /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_1474_USAN_TRANS_INV                         /* Eri: Float issue 1474: Fix USAN out-of-bounds warning. No OOB occurs, but the pointer is set to point to uninitialized memory. */

#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 */

lib_com/trans_direct_fx.c

+17 −3
Original line number Diff line number Diff line
@@ -76,14 +76,20 @@ void direct_transform_fx( 
            move32();

        }



#ifndef FIX_1474_USAN_TRANS_INV

        iseg_fx = &in32_r16_fx[-segment_length4]; /*Q*/

#endif

        oseg_fx = out32_fx; /*Q*/



        wh_fx = &win_fx[segment_length4]; /*Q15*/

        wl_fx = wh_fx - 1;                /*Q15*/



        shift = extract_l( L_mult0( 3, segment_length4 ) ); /*Q0*/

#ifdef FIX_1474_USAN_TRANS_INV

        sh_fx = &in32_r16_fx[segment_length2]; /*Q*/

#else

        sh_fx = &iseg_fx[shift];                    /*Q*/

#endif

        sl_fx2 = sh_fx - 1; /*Q*/
@@ -94,7 +100,11 @@ void direct_transform_fx( 
            move32();

        }



#ifdef FIX_1474_USAN_TRANS_INV

        sl_fx2 = &in32_r16_fx[( segment_length4 - 1 )]; /*Q*/

#else

        sl_fx2 = &iseg_fx[( segment_length2 - 1 )]; /*Q*/

#endif



        FOR( i = segment_length4; i < segment_length2; i++ )

        {
@@ -107,7 +117,11 @@ void direct_transform_fx( 
        edct_fx( dctin32_fx, oseg_fx, segment_length2, &Qs[0] );

        Qmin = s_min( Qs[0], Qmin );



#ifdef FIX_1474_USAN_TRANS_INV

        iseg_fx = &in32_r16_fx[segment_length4];

#else

        iseg_fx += segment_length2;

#endif

        oseg_fx += segment_length2;



        FOR( seg = 1; seg < NUM_TIME_SWITCHING_BLOCKS - 1; seg++ )

lib_com/trans_inv_fx.c

+19 −3
Original line number Diff line number Diff line
@@ -1032,7 +1032,11 @@ void Inverse_Transform( 
            }

        }



#ifdef FIX_1474_USAN_TRANS_INV

        out_segment = out_alias;

#else

        out_segment = out_alias - segment_length_div4;

#endif

        in_segment = in_mdct_modif; /*Q*/



        tmp = *Q;
@@ -1051,7 +1055,11 @@ void Inverse_Transform( 


        FOR( ta = segment_length_div4; ta < segment_length_div2; ta++ )

        {

#ifdef FIX_1474_USAN_TRANS_INV

            *out_segment++ = L_shr( alias[ta], tmp ); /*q_out*/

#else

            out_segment[ta] = L_shr( alias[ta], tmp );                        /*q_out*/

#endif

            move32();

        }

        /* This previous loop fills the output buffer from [0..seg_len_div4-1] */
@@ -1059,12 +1067,20 @@ void Inverse_Transform( 
        win2 = &win[segment_length_div2]; /*Q15*/

        FOR( ta = segment_length_div2; ta < segment_length; ta++ )

        {

#ifdef FIX_1474_USAN_TRANS_INV

            *out_segment++ = L_shr( Mult_32_16( alias[ta], *--win2 ), tmp ); /*q_out*/

#else

            out_segment[ta] = L_shr( Mult_32_16( alias[ta], *--win2 ), tmp ); /*q_out*/

#endif

            move32();

        }

        /* This previous loop fills the output buffer from [seg_len_div4..seg_len-seg_len_div4-1] */



#ifdef FIX_1474_USAN_TRANS_INV

        out_segment = &out_alias[segment_length_div4]; /*q_out*/

#else

        out_segment += segment_length_div2;                                   /*q_out*/

#endif

        in_segment += segment_length_div2; /*Q*/



        FOR( seg = 1; seg < NUM_TIME_SWITCHING_BLOCKS - 1; seg++ )