From: Kristian Høgsberg Kristensen <krh@bitplanet.net>
Date: Wed, 25 May 2016 16:30:26 +0000 (-0700)
Subject: i965: Fix shadowing of 'height' parameter
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89bb4be91e804a5eaa996822333a0c8c5ef423ae;p=mesa.git

i965: Fix shadowing of 'height' parameter

The nested declaration of 'height' shadows a parameter and uses
uninitialized memory. Fix by renaming to 'plane_height' which also makes
the code clearer.

This would typically break the bo size computation, but we don't use
that except when mmaping, and we don't mmap YUV buffers much.

Signed-off-by: Kristian Høgsberg Kristensen <krh@bitplanet.net>
Reported-by: Mathias Fröhlich <Mathias.Froehlich@gmx.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 19a66786e30..4f14201aebf 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -732,8 +732,8 @@ intel_create_image_from_fds(__DRIscreen *screen,
       image->offsets[index] = offsets[index];
       image->strides[index] = strides[index];
 
-      const int height = height >> f->planes[i].height_shift;
-      const int end = offsets[index] + height * strides[index];
+      const int plane_height = height >> f->planes[i].height_shift;
+      const int end = offsets[index] + plane_height * strides[index];
       if (size < end)
          size = end;
    }