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

Brian Paul brianp at kemper.freedesktop.org
Fri Apr 10 14:39:30 UTC 2009


Module: Mesa
Branch: master
Commit: ded05d32d5f948770ece088ea0ed6363c0055a4c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ded05d32d5f948770ece088ea0ed6363c0055a4c

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Apr 10 08:35:21 2009 -0600

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

Fixes segfaults when rendering to front buffer.

---

 src/mesa/drivers/dri/intel/intel_context.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 56d03c1..3436b8e 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);




More information about the mesa-commit mailing list