glx: Put null check before use

'dpy' was being checked for null *after* it was already used once.

Also add a null check for psc, and drop gc's redundant initialization.
This commit is contained in:
nobled
2010-08-19 14:06:21 -04:00
committed by Eric Anholt
parent df54b53b7d
commit b5dc40710d

View File

@@ -215,12 +215,16 @@ CreateContext(Display * dpy, int generic_id,
Bool allowDirect,
unsigned code, int renderType, int screen)
{
struct glx_context *gc = NULL;
struct glx_screen *const psc = GetGLXScreenConfigs(dpy, screen);
struct glx_context *gc;
struct glx_screen *psc;
struct glx_context *shareList = (struct glx_context *) shareList_user;
if (dpy == NULL)
return NULL;
psc = GetGLXScreenConfigs(dpy, screen);
if (psc == NULL)
return NULL;
if (generic_id == None)
return NULL;