egl: Fix deref before NULL-check
authorKristian Høgsberg <krh@bitplanet.net>
Thu, 29 Jul 2010 03:54:16 +0000 (23:54 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 29 Jul 2010 03:54:16 +0000 (23:54 -0400)
src/egl/main/eglcontext.c

index 74a5a632eba1ea34c904ef07e6c5172f7e6181ec..9fc529613e587a13e67354400c0a56d3e9516cbe 100644 (file)
@@ -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;