From a0ac118398c924f2ae75e5649fbaacd95abd231f Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 16 Feb 2017 13:06:07 +0000 Subject: [PATCH] i965/fs: fix uninitialized memory access Found while running shader-db under valgrind. Signed-off-by: Lionel Landwerlin Reviewed-by: Jordan Justen Cc: "13.0 17.0" --- src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp index f56f05b7e9b..952276faed8 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp @@ -207,9 +207,8 @@ fs_visitor::register_coalesce() channels_remaining = -1; continue; } - dst_reg_offset[offset] = inst->dst.offset / REG_SIZE; - if (inst->size_written > REG_SIZE) - dst_reg_offset[offset + 1] = inst->dst.offset / REG_SIZE + 1; + for (unsigned i = 0; i < MAX2(inst->size_written / REG_SIZE, 1); i++) + dst_reg_offset[offset + i] = inst->dst.offset / REG_SIZE + i; mov[offset] = inst; channels_remaining -= regs_written(inst); } -- 2.30.2