Commit d91dc84b authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] invalid free in DeletePredictionDecoder()

parent 1eb42d2e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define API_5MS_BASELINE                                /* FhG: baseline with 20ms rendering and split rendering through 20ms branch */

#endif

#define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK

#define FIX_CQMFPREDDEC_FREE                            /* FhG: avoid double free / free of NULL in DeletePredictionDecoder() */

// 5 ms branch switches end

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

lib_rend/ivas_CQMFDecoder.c

+9 −1
Original line number Diff line number Diff line
@@ -654,7 +654,15 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) 
        }

#endif



#ifdef FIX_CQMFPREDDEC_FREE

        if ( psCQMFDecoder->psPredictionDecoder != NULL )

        {

#endif

            DeletePredictionDecoder( psCQMFDecoder->psPredictionDecoder );

#ifdef FIX_CQMFPREDDEC_FREE

            psCQMFDecoder->psPredictionDecoder = NULL;

        }

#endif



        if ( psCQMFDecoder->psNoiseGen != NULL )

        {