From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 Jul 2011 23:29:28 +0000 (-0600)
Subject: intel: add null src pointer check in intel_region_reference()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8f65c07e9f3a5948c8bee95482bcab651b33c01;p=mesa.git

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@anholt.net>
---

diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 6cf37c4c40c..4c4945c7941 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;
    }
 }