Commit c3c42cf4 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1836-replace-overflow-basop-operators-by-overflow-free-variants-in-lib_com
parents b8707595 ea04c2d4

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 
#define ISSUE_1836_FILEACTIVE_window_fx_c

#endif



#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/



/* #################### End BASOP porting switches ############################ */



#endif

lib_dec/ivas_mct_dec_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,13 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
            IF( st_ivas->hBinRenderer != NULL && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) )

            {

                ivas_binRenderer_close_fx( &st_ivas->hBinRenderer );

#ifdef FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR

                test();

                IF( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )

                {

                    efap_free_data_fx( &st_ivas->hEFAPdata );

                }

#endif

            }



            test();