From 2c343af09873f35cbc7b265d5606a228fe304bb9 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed, 28 Jul 2010 23:54:16 -0400
Subject: egl: Fix deref before NULL-check

---
 src/egl/main/eglcontext.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/egl/main/eglcontext.c')

diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 74a5a632eb..9fc529613e 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -301,7 +301,7 @@ static EGLBoolean
 _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read)
 {
    _EGLThreadInfo *t = _eglGetCurrentThread();
-   _EGLDisplay *dpy = ctx->Resource.Display;
+   _EGLDisplay *dpy;
    EGLint conflict_api;
    EGLBoolean surfaceless;
 
@@ -315,6 +315,7 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read)
       return EGL_TRUE;
    }
 
+   dpy = ctx->Resource.Display;
    switch (_eglGetContextAPIBit(ctx)) {
    case EGL_OPENGL_ES_BIT:
       surfaceless = dpy->Extensions.KHR_surfaceless_gles1;
-- 
cgit v1.2.3