check for fence==NULL in intel_batchbuffer_finish(), fixes glxinfo crash on exit

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c b/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c
index 784ed2210acebd38e7a5b43caa0d54b772762a8b..49e04d81ec1ef1315e58d561070628fb534ce69c 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c
@@ -311,11 +311,13 @@ void
 intel_batchbuffer_finish(struct intel_batchbuffer *batch)
 {
    struct _DriFenceObject *fence = intel_batchbuffer_flush(batch);
-   driFenceReference(fence);
-   driFenceFinish(fence,
-                  DRM_FENCE_TYPE_EXE | DRM_I915_FENCE_TYPE_RW,
-                  GL_FALSE);
-   driFenceUnReference(fence);
+   if (fence) {
+      driFenceReference(fence);
+      driFenceFinish(fence,
+                     DRM_FENCE_TYPE_EXE | DRM_I915_FENCE_TYPE_RW,
+                     GL_FALSE);
+      driFenceUnReference(fence);
+   }
 }