Commit d07a75b8 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch... 

Merge branch '1060-usan-index-out-of-bounds-in-ivas_dirac_dec-c-for-osba-to-binaural_room-decoding-with-head' into 'main'

Resolve "USAN: index out of bounds in ivas_dirac_dec.c for OSBA to BINAURAL_ROOM* decoding with head rotation at bitrates >=256kbps"

See merge request !1502
parents 8e82ef62 d91a39e2

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 
#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

#define FIX_970_USAN_IN_NELP_SEED

#define FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */



#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */



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

lib_dec/ivas_dirac_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -2317,8 +2317,13 @@ void ivas_dirac_dec_render_sf( 


                                for ( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )

                                {

#ifdef FIX_1060_USAN_ARRAY_BOUNDS

                                    Cldfb_RealBuffer[j2][k][l] += g * *( tc_re++ );

                                    Cldfb_ImagBuffer[j2][k][l] += g * *( tc_im++ );

#else

                                    Cldfb_RealBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_re++ );

                                    Cldfb_ImagBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_im++ );

#endif

                                }

                                w1 += hSpatParamRendCom->num_freq_bands;

                            }