From: Brian Paul <brianp@vmware.com>
Date: Fri, 10 Apr 2009 14:35:21 +0000 (-0600)
Subject: intel: added screen->dri2.loader null pointer check in intel_flush()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ded05d32d5f948770ece088ea0ed6363c0055a4c;p=mesa.git

intel: added screen->dri2.loader null pointer check in intel_flush()

Fixes segfaults when rendering to front buffer.
---

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 56d03c1e784..3436b8ecd30 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -400,7 +400,8 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
    if ((ctx->DrawBuffer->Name == 0) && intel->front_buffer_dirty) {
       __DRIscreen *const screen = intel->intelScreen->driScrnPriv;
 
-      if ((screen->dri2.loader->base.version >= 2)
+      if (screen->dri2.loader &&
+          (screen->dri2.loader->base.version >= 2)
 	  && (screen->dri2.loader->flushFrontBuffer != NULL)) {
 	 (*screen->dri2.loader->flushFrontBuffer)(intel->driDrawable,
 						  intel->driDrawable->loaderPrivate);