Commit 41336cb0 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '832-asan-error-for-osba-decoder-with-bitrate-switching-and-plc' into 'main' 

fix for preventing existing  EFAP memories being reallocated

See merge request !1145
parents b15a5701 8e26e448

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 




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



#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA                       /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt selection floating point code */

lib_dec/ivas_ism_renderer.c

+4 −1
Original line number Diff line number Diff line
@@ -67,8 +67,11 @@ ivas_error ivas_ism_renderer_open( 
    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM renderer\n" ) );

    }



#ifdef BE_FIX_832_ASAN_ERROR_EFAP_OSBA

    if ( st_ivas->hIntSetup.is_loudspeaker_setup && st_ivas->hIntSetup.ls_azimuth != NULL && st_ivas->hIntSetup.ls_elevation != NULL && st_ivas->hEFAPdata == NULL )

#else

    if ( st_ivas->hIntSetup.is_loudspeaker_setup && st_ivas->hIntSetup.ls_azimuth != NULL && st_ivas->hIntSetup.ls_elevation != NULL )

#endif

    {

        if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )

        {