Commit f768a7f8 authored by vaclav's avatar vaclav
Browse files

issue 779: fix Crash in ISM rate switching with BINAURAL_ROOM_REVERB; under ... 

issue 779: fix Crash in ISM rate switching with BINAURAL_ROOM_REVERB; under  NONBE_FIX_779_ISM_FREE_REVERB_HANDLE
parent 006a21f5

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ 
#define NONBE_FIX_770_PLANAR_SBA_JBM                          /* FhG  : Issue #770: Crash in planar FOA decoding with JBM caused by uninitialized value */

#define NONBE_FIX_760_COHERENCE_MASA                          /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                      /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

#define NONBE_FIX_779_ISM_FREE_REVERB_HANDLE                  /* VA: issue 779: fix Crash in ISM rate switching with BINAURAL_ROOM_REVERB */



/* ##################### End NON-BE switches ############################# */

lib_rend/ivas_reverb.c

+64 −51
Original line number Diff line number Diff line
@@ -1286,8 +1286,16 @@ void ivas_reverb_close( 


    hReverb = *hReverb_in;



#ifdef NONBE_FIX_779_ISM_FREE_REVERB_HANDLE

    if ( *hReverb_in == NULL || hReverb_in == NULL )

    {

        return;

    }



#else

    if ( hReverb != NULL )

    {

#endif

    for ( loop_idx = 0; loop_idx < IVAS_REV_MAX_NR_BRANCHES; loop_idx++ )

    {

        if ( hReverb->loop_delay_buffer[loop_idx] != NULL )
@@ -1300,9 +1308,14 @@ void ivas_reverb_close( 
    free( hReverb->pPredelay_buffer );

    hReverb->pPredelay_buffer = NULL;



#ifdef NONBE_FIX_779_ISM_FREE_REVERB_HANDLE

    free( *hReverb_in );

    *hReverb_in = NULL;

#else

        free( hReverb );

        hReverb = NULL;

    }

#endif



    return;

}