From 0114d293fcfe445c6d69e3e77e0fc399b9f46f3c Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Tue, 27 Aug 2024 20:34:46 +0200 Subject: [PATCH] radeonsi/vcn: fix maybe uninitialized Detected when working on adding support for Undefined Behaviour Sanitizer, this fixes: ``` ../src/gallium/drivers/radeonsi/radeon_vcn_dec.c: In function 'get_h264_msg': ../src/gallium/drivers/radeonsi/radeon_vcn_dec.c:239:50: error: 'k' may be used uninitialized [-Werror=maybe-uninitialized] 239 | && (k == ARRAY_SIZE(dec->h264_valid_poc_num))) { | ~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/gallium/drivers/radeonsi/radeon_vcn_dec.c:77:19: note: 'k' was declared here 77 | unsigned i, j, k; | ^ cc1: all warnings being treated as errors ``` Reviewed-by: David Rosca Signed-off-by: Juan A. Suarez Romero Part-of: --- src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c index 9c42b654d84..72168d2ed1c 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c @@ -235,12 +235,11 @@ static rvcn_dec_message_avc_t get_h264_msg(struct radeon_decoder *dec, || dec->h264_valid_poc_num[k] == result.field_order_cnt_list[i][1])) break; } - } - if (result.ref_frame_list[i] != 0xff && (j == ARRAY_SIZE(dec->h264_valid_ref_num)) - && (k == ARRAY_SIZE(dec->h264_valid_poc_num))) { - result.non_existing_frame_flags |= 1 << i; - result.curr_pic_ref_frame_num--; - result.ref_frame_list[i] = 0xff; + if ((j == ARRAY_SIZE(dec->h264_valid_ref_num)) && (k == ARRAY_SIZE(dec->h264_valid_poc_num))) { + result.non_existing_frame_flags |= 1 << i; + result.curr_pic_ref_frame_num--; + result.ref_frame_list[i] = 0xff; + } } }