Mesa (master): intel: add null src pointer check in intel_region_reference( )

Brian Paul brianp at kemper.freedesktop.org
Fri Jul 8 01:22:43 UTC 2011


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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jul  7 17:29:28 2011 -0600

intel: add null src pointer check in intel_region_reference()

Fixes segfault when running cubemap demo on i945.  This happened
when intel_region_reference() was called in i915_set_draw_region()
with depth_region=NULL.

Reviewed-by: Eric Anholt <eric at anholt.net>

---

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

diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 6cf37c4..4c4945c 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -271,7 +271,8 @@ intel_region_reference(struct intel_region **dst, struct intel_region *src)
       if (*dst)
 	 intel_region_release(dst);
 
-      src->refcount++;
+      if (src)
+         src->refcount++;
       *dst = src;
    }
 }




More information about the mesa-commit mailing list