'dpy' was being checked for null *after* it was already used once.
From 606d6522e90abe526755d80d28754a8229a99baf Mon Sep 17 00:00:00 2001
From: nobled <[email protected]>
Date: Fri, 30 Jul 2010 12:09:18 +0000
Subject: [PATCH] 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 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index d4aa8b5..becbab4 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -262,12 +262,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;
--
1.5.4.3
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
