From 89bb4be91e804a5eaa996822333a0c8c5ef423ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg=20Kristensen?= Date: Wed, 25 May 2016 09:30:26 -0700 Subject: [PATCH] i965: Fix shadowing of 'height' parameter MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reported-by: Mathias Fröhlich Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/intel_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- 2.30.2