From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date: Tue, 1 Nov 2011 09:41:08 +0000 (+0800)
Subject: intel: fix potential segfault error
X-Git-Tag: mesa-8.0-rc1~1315
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81d5195a6105606910d0d19ab059962e5712c2e0;p=platform%2Fupstream%2Fmesa.git

intel: fix potential segfault error

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index a657732..f4c1a68 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -125,14 +125,16 @@ intel_tex_map_image_for_swrast(struct intel_context *intel,
 			       struct intel_texture_image *intel_image,
 			       GLbitfield mode)
 {
-   int level = intel_image->base.Base.Level;
-   int face = intel_image->base.Base.Face;
+   int level;
+   int face;
    struct intel_mipmap_tree *mt;
    unsigned int x, y;
 
    if (!intel_image || !intel_image->mt)
       return;
 
+   level = intel_image->base.Base.Level;
+   face = intel_image->base.Base.Face;
    mt = intel_image->mt;
 
    if (mt->target == GL_TEXTURE_3D ||