From c03cfca3806f45948627715b25b46839a07be979 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Mon, 3 Apr 2006 01:31:59 +0000
Subject: [PATCH] Coverity #986: Prevent a NULL chase.

---
 ChangeLog        | 5 +++++
 GL/glx/glxcmds.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3121f45a4..5fceec53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-02  Adam Jackson  <ajax@freedesktop.org>
+
+	* GL/glx/glxcmds.c:
+	Coverity #986: Prevent a NULL chase.
+
 2006-04-02  Adam Jackson  <ajax@freedesktop.org>
 
 	* Xext/sync.c:
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 0b7525eb9..3845c9289 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1926,10 +1926,10 @@ static int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
     XID drawable = req->drawable;
     int barrier = req->barrier;
     DrawablePtr pDraw = (DrawablePtr) LookupDrawable(drawable, client);
-    int screen = pDraw->pScreen->myNum;
-
+    int screen;
 
     if (pDraw && (pDraw->type == DRAWABLE_WINDOW)) {
+	screen = pDraw->pScreen->myNum;
         if (__glXSwapBarrierFuncs &&
             __glXSwapBarrierFuncs[screen].bindSwapBarrierFunc) {
             int ret = __glXSwapBarrierFuncs[screen].bindSwapBarrierFunc(screen, drawable, barrier);