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

Author: Yuanhan Liu <[email protected]>
Date:   Tue Nov  1 17:41:08 2011 +0800

intel: fix potential segfault error

Signed-off-by: Yuanhan Liu <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>

---

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

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 ||

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to