Commit 4473003c authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '879-usan-nullpointer-with-nonzero-offset-in-masa-decoding' into 'main' 

Resolve "USAN: nullpointer-with-nonzero-offset in MASA decoding"

See merge request !1186
parents 2d1a2128 17b8352c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
#define FIX_814_DOUBLE_PREC_IN_REVERB                   /* Philips: Issue 814: Replace double precision arithmetic in reverb */

#define FIX_866_MOVE_VBAP                               /* Nokia: Issue 866: Move VBAP to lib_rend */

#define FIX_863_REMOVE_REDUNDANCIES_OMASA               /* Nokia/VA: Issue 863: Remove redundancies in stereo_classifier for OMASA */

#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */



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

lib_dec/ivas_dirac_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1812,7 +1812,11 @@ void ivas_dirac_dec_render_sf( 
    DirAC_mem = hDirACRend->stack_mem;



    reference_power = DirAC_mem.reference_power;

#ifdef FIX_879_USAN_ERROR_IN_MASA_DECODING

    reference_power_smooth = ( DirAC_mem.reference_power == NULL ) ? NULL : DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#else

    reference_power_smooth = DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#endif

    onset_filter = DirAC_mem.onset_filter;

    onset_filter_subframe = ( DirAC_mem.onset_filter == NULL ) ? NULL : DirAC_mem.onset_filter + hSpatParamRendCom->num_freq_bands;

scripts/ubsan.supp

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ implicit-signed-integer-truncation:pvq_core_dec.c 
implicit-signed-integer-truncation:pvq_core_enc.c

implicit-signed-integer-truncation:tcq_position_arith.c

implicit-signed-integer-truncation:tools.c

pointer-overflow:ivas_dirac_dec.c

shift-base:basop32.c

shift-base:enh40.c

shift-base:enh40.h