diff --git a/lib_com/options.h b/lib_com/options.h index be86aa6f646b1587e9cc52be538699fa131b34c0..5d1376c88738c6076308c2a24cf64e556d4266b1 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 a339aa30ace617b08d70c82d281ef42ca633ca7f..377c1b22ad0e75e29d7f6147a2ec5440545c234d 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; } +#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; }