Mesa (mesa_7_5_branch): intel: added null ptr check

Brian Paul brianp at kemper.freedesktop.org
Wed May 13 17:36:50 UTC 2009


Module: Mesa
Branch: mesa_7_5_branch
Commit: 99960393edb3d6c0d3702cf51b59c2e4189117c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99960393edb3d6c0d3702cf51b59c2e4189117c7

Author: Brian Paul <brianp at vmware.com>
Date:   Wed May 13 11:31:35 2009 -0600

intel: added null ptr check

Fixes segfault in context tear-down when glClear was never called.

---

 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 07d53aa..5dc3df3 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -756,7 +756,8 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
 
       INTEL_FIREVERTICES(intel);
 
-      _mesa_delete_array_object(&intel->ctx, intel->clear.arrayObj);
+      if (intel->clear.arrayObj)
+         _mesa_delete_array_object(&intel->ctx, intel->clear.arrayObj);
 
       intel->vtbl.destroy(intel);
 




More information about the mesa-commit mailing list