From 5320594653ea6080b0272e4628c0be2e1fca3025 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 21 Jul 2023 11:55:49 +0200 Subject: [PATCH] change variable type to fix usan complaint --- lib_com/options.h | 1 + lib_dec/tonalMDCTconcealment.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index cfbad5ab4f..ad545161f9 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -210,6 +210,7 @@ #define FIX_622_SILENCE_USAN_WARNING /* FhG: silenceusan warning in ifft code */ #define FIX_615_UBSAN_SPAR_TO_DIRAC /*Dlb : Fix for UBSAN issue 615*/ +#define FIX_626_VARIABLE_TYPE_MDCT_CONC /* FhG: trivial fix to fix USAN error */ /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c index 86340ab181..e4d033d7fb 100644 --- a/lib_dec/tonalMDCTconcealment.c +++ b/lib_dec/tonalMDCTconcealment.c @@ -126,7 +126,11 @@ void TonalMDCTConceal_SaveFreqSignal( const int16_t infoIGFStartLine ) { float *temp; +#ifdef FIX_626_VARIABLE_TYPE_MDCT_CONC + uint16_t nOldSamples; +#else int16_t nOldSamples; +#endif assert( nNewSamples > 0 && nNewSamples <= 2 * L_FRAME_MAX ); -- GitLab