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>
This commit is contained in:
Kristian Høgsberg Kristensen
2016-05-25 09:30:26 -07:00
parent 595224f714
commit 89bb4be91e

View File

@@ -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;
}