Commit 4b689294 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into basop-2570-ASAN-global-buffer-overflow-in-ivas_objectRenderer_sources_fx

parents 07b20e45 52881dcc

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 
#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_BASOP_2560_STEREO_DFT_DEC_RESET             /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */

#define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

#define FIX_BASOP_2573_RF_MODE_UPDATE                   /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

lib_dec/ivas_init_dec_fx.c

+3 −6
Original line number Diff line number Diff line
@@ -2765,12 +2765,6 @@ ivas_error ivas_init_decoder_fx( 
        set32_fx( st_ivas->mem_hp20_out_fx[i], 0, L_HP20_MEM + 2 );

    }



#ifdef FIX_1585_ASAN_FORMAT_SW_ALT

    FOR( ; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

    {

        st_ivas->mem_hp20_out_fx[i] = NULL;

    }

#endif



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

     * Allocate and initialize rendering handles
@@ -3467,6 +3461,9 @@ void ivas_initialize_handles_dec( 
    FOR( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

    {

        st_ivas->p_output_fx[i] = NULL;

#ifdef FIX_1585_ASAN_FORMAT_SW_ALT

        st_ivas->mem_hp20_out_fx[i] = NULL;

#endif

    }



    return;