mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

primitives: ensure primitives_get() returns a populated struct

Browse Source 
Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658
This commit is contained in:
Mike Gilbert 2018-05-16 16:15:50 -04:00 committed by Mike Gilbert
parent 0255a7db15
commit 9460f4292b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp/primitives/primitives.c
View File

@ -28,10 +28,12 @@
#include "prim_internal.h"
/* Singleton pointer used throughout the program when requested. */
static primitives_t pPrimitives = { 0 };
static primitives_t pPrimitivesGeneric = { 0 };
static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
#if defined(HAVE_OPTIMIZED_PRIMITIVES)
static primitives_t pPrimitives = { 0 };
static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT;
#endif
/* ------------------------------------------------------------------------- */
@ -74,8 +76,10 @@ primitives_t* primitives_get(void)
InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic, NULL, NULL);
#if defined(HAVE_OPTIMIZED_PRIMITIVES)
InitOnceExecuteOnce(&primitives_InitOnce, primitives_init, NULL, NULL);
#endif
return &pPrimitives;
#else
return &pPrimitivesGeneric;
#endif
}
primitives_t* primitives_get_generic(void)