From 4a999b7f9c6f26372c20563148822364c466de74 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Wed, 5 Mar 2025 11:46:31 +0100 Subject: [PATCH 1/3] update if condition in render config reading to fix compiler warning --- lib_util/render_config_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index a339aa30ac..cccf08f385 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2369,7 +2369,7 @@ ivas_error RenderConfigReader_read( errorHandler( item, ERROR_VALUE_INVALID ); return IVAS_ERR_INVALID_RENDER_CONFIG; } - if ( i > pRenderConfigReader->nFG || &pRenderConfigReader->pFG[i] == NULL ) + if ( i > pRenderConfigReader->nFG || pRenderConfigReader->pFG == NULL ) { return IVAS_ERR_INVALID_RENDER_CONFIG; } -- GitLab From a208ac25f98061937048dbbb639406528ae8a155 Mon Sep 17 00:00:00 2001 From: Marek Szczerba Date: Tue, 11 Mar 2025 10:53:16 +0100 Subject: [PATCH 2/3] Update for the fix, including a compiler switch --- lib_com/options.h | 1 + lib_util/render_config_reader.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index be86aa6f64..5d1376c887 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -160,6 +160,7 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */ +#define FIX_1285_RENDER_CONFIG_PTR_COMPARE /* Philips: Warning about pointer comparison in the render config reader */ /* #################### End BE switches ################################## */ diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index cccf08f385..05244201da 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2369,7 +2369,11 @@ ivas_error RenderConfigReader_read( errorHandler( item, ERROR_VALUE_INVALID ); return IVAS_ERR_INVALID_RENDER_CONFIG; } - if ( i > pRenderConfigReader->nFG || pRenderConfigReader->pFG == NULL ) +#ifdef FIX_1285_RENDER_CONFIG_PTR_COMPARE + if ( i > pRenderConfigReader->nFG || pRenderConfigReader->pFG[i].pFc == NULL ) +#else + if ( i > pRenderConfigReader->nFG || &pRenderConfigReader->pFG[i] == NULL ) +#endif { return IVAS_ERR_INVALID_RENDER_CONFIG; } -- GitLab From e3d918190143b7ea13cbed51ab51a3bc159217ee Mon Sep 17 00:00:00 2001 From: Marek Szczerba Date: Tue, 11 Mar 2025 11:11:18 +0100 Subject: [PATCH 3/3] Updated check for index agains number of frequency grids available --- lib_util/render_config_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 05244201da..377c1b22ad 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2370,7 +2370,7 @@ ivas_error RenderConfigReader_read( return IVAS_ERR_INVALID_RENDER_CONFIG; } #ifdef FIX_1285_RENDER_CONFIG_PTR_COMPARE - if ( i > pRenderConfigReader->nFG || pRenderConfigReader->pFG[i].pFc == NULL ) + if ( i >= pRenderConfigReader->nFG || pRenderConfigReader->pFG[i].pFc == NULL ) #else if ( i > pRenderConfigReader->nFG || &pRenderConfigReader->pFG[i] == NULL ) #endif -- GitLab