Commit 28f1f9e3 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '1003-usan-applying-zero-offset-to-null-pointer-in-ivas_jbm_dec-c' into 'main' 

Resolve "USAN: applying zero offset to null pointer in ivas_jbm_dec.c"

See merge request !1402
parents e0a027db a149d593

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */



#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */





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

lib_dec/ivas_ism_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -343,11 +343,13 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        tc_nchan_allocate_new = tc_nchan_tc_new;

        tc_nchan_full_new = tc_nchan_tc_new;



#ifndef FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

            tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS;

            tc_nchan_full_new = tc_nchan_allocate_new;

        }

#endif



        if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {