Commit a942844b authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '531-memorysanitizer-use-of-uninitialized-value-in-ism2-rate-switching-with-frame-errors' into 'main'

Resolve "MemorySanitizer: use-of-uninitialized-value in ISM2 rate switching with frame errors"

See merge request !717
parents 454f16b7 b2be6fb0

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ 
#define FIX_570_TCX_LPC_WRITE                           /* FhG: fix issue 570: LPC bitstream writer in TCX */

#define FIX_506                                         /* FhG: Compiler warnings */

#define FIX_511_OPTIMIZE_PARAMBIN_GAIN_FETCH            /* Nokia: Issue 511, significant optimization of parametric binauralizer gain fetching. */

#define FIX_531_BWS_ISM_BFI                             /* VA: issue 531: fix MemorySanitizer: use-of-uninitialized-value in ISM2 rate switching with frame errors */





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -504,7 +504,11 @@ ivas_error ivas_core_dec( 
         * SWB(FB) BWE decoding

         *---------------------------------------------------------------------*/



#ifdef FIX_531_BWS_ISM_BFI

        if ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && !st->con_tcx && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) )

#else

        if ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) )

#endif

        {

            /* SWB TBE decoder */

            swb_tbe_dec( st, hStereoICBWE, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], tmp_buffer /*fb_exc*/, hb_synth[n], pitch_buf[n] );