]> git.gag.com Git - fw/openocd/commitdiff
arm_adi_v5: fix scan-build warning [2/3]
authorAntonio Borneo <borneo.antonio@gmail.com>
Wed, 1 Jun 2022 17:02:54 +0000 (19:02 +0200)
committerAntonio Borneo <borneo.antonio@gmail.com>
Fri, 10 Jun 2022 21:54:17 +0000 (21:54 +0000)
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 <borneo.antonio@gmail.com>
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 <vanekt@fbl.cz>
src/target/arm_adi_v5.c

index f7b335d95c5d08e3ff3df516e8f02c50e72d8897..0b11e815d509eefb4691f38e90e6024c45713a6c 100644 (file)
@@ -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;