Mesa (master): i965: Fix shadowing of 'height' parameter
Kristian Høgsberg
krh at kemper.freedesktop.org
Wed May 25 16:47:50 UTC 2016
Module: Mesa
Branch: master
Commit: 89bb4be91e804a5eaa996822333a0c8c5ef423ae
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=89bb4be91e804a5eaa996822333a0c8c5ef423ae
Author: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Date: Wed May 25 09:30:26 2016 -0700
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 at bitplanet.net>
Reported-by: Mathias Fröhlich <Mathias.Froehlich at gmx.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
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 19a6678..4f14201 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;
}
More information about the mesa-commit
mailing list