diff --git a/lib_com/options.h b/lib_com/options.h index ac82f1e9bad70cbca962edcb05000d13560cee76..743ca90d004c96eb8e7144262f89e6957b2459b4 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -110,6 +110,7 @@ #define FIX_BASOP_2350_HARM_0B_BWE_2 /* VA: basop issue 2350: Simplify calling of hf_synth_fx() */ #define FIX_2349_HARM_FIND_UV /* VA: basop issue 2349: harmonization of find_uv() function */ #define FIX_2370_UNUSED_BUFFERS_CORE_ENC /* VA: basop issue 2370: remove temporary input buffers in core-encoder */ +#define FIX_2376_FIX_USAN_PRE_PROC /* VA: basop issue 2376: Resolve "USAN: SEGV in ivas_compute_core_buffers_fx() */ /* #################### End BE switches ################################## */ diff --git a/lib_enc/ivas_core_pre_proc_fx.c b/lib_enc/ivas_core_pre_proc_fx.c index a6e8966dfaf831234a15545dc2d098db9b1823ca..142931191e09704237ff3c5f5ce171c11d0c16c1 100644 --- a/lib_enc/ivas_core_pre_proc_fx.c +++ b/lib_enc/ivas_core_pre_proc_fx.c @@ -786,7 +786,11 @@ ivas_error ivas_compute_core_buffers_fx( #endif Word16 *preemp_start_idx = NULL; #ifdef FIX_2344_ALIGN_PREPROC +#ifdef FIX_2376_FIX_USAN_PRE_PROC + Word32 sig_out[STEREO_DFT_OVL_16k + L_FRAME16k + L_FILT16k], max_32; +#else Word32 sig_out[STEREO_DFT_OVL_16k + L_FRAME16k /* = max( L_FRAME16k + STEREO_DFT_OVL_16k, L_FRAME16k + L_FILT16k + lMemRecalc_16k ) */], max_32; +#endif #else Word32 sig_out[960], max_32; #endif