Commit f88cd4a4 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '1285-render-config-reader-warning-about-pointer-comparison' into 'main' 

Resolve "Render config reader: warning about pointer comparison"

See merge request !2033
parents 7dc55586 e3d91819

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ################################## */

lib_util/render_config_reader.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

                        }