From aee7c70a1a710ba8442b1aabff16d2f28eec2db2 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Wed, 1 Jun 2022 19:02:54 +0200 Subject: [PATCH] arm_adi_v5: fix scan-build warning [2/3] Commit d01b3d69ec17 ("arm_adi_v5: separate ROM table parsing from command output [3/3]") introduces a new scan-build warning because removing one return in case of error causes using uninitialized values. Add back the return on error. Change-Id: I10ddc548b756d34aaccc0511f091b4caa5ec271a Signed-off-by: Antonio Borneo Fixes: d01b3d69ec17 ("arm_adi_v5: separate ROM table parsing from command output [3/3]") Reviewed-on: https://review.openocd.org/c/openocd/+/7011 Tested-by: jenkins Reviewed-by: Tomas Vanek --- src/target/arm_adi_v5.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index f7b335d95..0b11e815d 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -1552,8 +1552,10 @@ static int rtp_rom_loop(const struct rtp_ops *ops, } if (retval == ERROR_OK) retval = dap_run(ap->dap); - if (retval != ERROR_OK) + if (retval != ERROR_OK) { LOG_DEBUG("Failed read ROM table entry"); + return retval; + } if (width == 64) { romentry = (((uint64_t)romentry_high) << 32) | romentry_low;