From ffb91088f8d59efb5a5f2dcb6371e04129e43469 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 11 Oct 2023 09:29:35 +0200 Subject: [PATCH] issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close(); under FIX_852_FIX_HANDLE_DEREF --- lib_com/ivas_ism_com.c | 8 ++++++-- lib_com/options.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib_com/ivas_ism_com.c b/lib_com/ivas_ism_com.c index 344f346d47..69cfd10b07 100644 --- a/lib_com/ivas_ism_com.c +++ b/lib_com/ivas_ism_com.c @@ -596,13 +596,17 @@ ISM_MODE ivas_ism_mode_select( * ---------------------------------------------------------------*/ void ivas_ism_metadata_close( - ISM_METADATA_HANDLE hIsmMetaData[], /* i/o : object metadata handles */ - const int16_t first_idx /* i : index of first handle to deallocate */ + ISM_METADATA_HANDLE hIsmMetaData[], /* i/o: object metadata handles */ + const int16_t first_idx /* i : index of first handle to deallocate */ ) { int16_t n; +#ifdef FIX_852_FIX_HANDLE_DEREF + if ( hIsmMetaData == NULL || *hIsmMetaData == NULL ) +#else if ( hIsmMetaData == NULL || hIsmMetaData == NULL ) +#endif { return; } diff --git a/lib_com/options.h b/lib_com/options.h index 220d5fc629..468516fff2 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -156,6 +156,7 @@ #define FIX_818_DOUBLE_PREC_KERNEL_SW /* FhG: Issue 818: Avoid double precision in kernel switching */ #define FIX_822_REFACTOR_BIN_REVERB_OPEN /* Nokia: Addresses first step of issue 822 by refactoring ivas_binaural_reverb_open */ #define FIX_847_OUTPUT_PCM_BUFFER /* VA: issue 847: Allocate decoder output PCM buffer dynamically */ +#define FIX_852_FIX_HANDLE_DEREF /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */ /* #################### End BE switches ################################## */ -- GitLab