From b5dc40710d0e5edffb9f673dfbf26df4d0043eef Mon Sep 17 00:00:00 2001 From: nobled Date: Thu, 19 Aug 2010 14:06:21 -0400 Subject: 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. --- src/glx/glxcmds.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/glx') diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index d12ff9684e..80eaf72b7d 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -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; -- cgit v1.2.3