From: Chia-I Wu <olv@lunarg.com>
Date: Thu, 14 Oct 2010 09:13:36 +0000 (+0800)
Subject: st/egl: Do not finish a fence that is NULL.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d6de1f44a0cdcc739d3b319b5f102e1733e5b4e3;p=mesa.git

st/egl: Do not finish a fence that is NULL.

i915g would dereference the NULL pointer.
---

diff --git a/src/gallium/state_trackers/egl/common/egl_g3d_api.c b/src/gallium/state_trackers/egl/common/egl_g3d_api.c
index c0164daf9c1..3bde39737ba 100644
--- a/src/gallium/state_trackers/egl/common/egl_g3d_api.c
+++ b/src/gallium/state_trackers/egl/common/egl_g3d_api.c
@@ -609,8 +609,10 @@ egl_g3d_wait_client(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx)
 
    gctx->stctxi->flush(gctx->stctxi,
          PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, &fence);
-   screen->fence_finish(screen, fence, 0);
-   screen->fence_reference(screen, &fence, NULL);
+   if (fence) {
+      screen->fence_finish(screen, fence, 0);
+      screen->fence_reference(screen, &fence, NULL);
+   }
 
    return EGL_TRUE;
 }