target/riscv-011: Fix memory leak in handle_halt_routine()

[openocd.git] / src / target / riscv / riscv-011.c

diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c
index f2a68698b1a9cf3bf21f9385e2ef3c95b089e00e..bd3f159fbeebd213683cb8eefc68867f8f695579 100644 (file)
--- a/src/target/riscv/riscv-011.c
+++ b/src/target/riscv/riscv-011.c
@@ -240,6 +240,7 @@ static unsigned int slot_offset(const struct target *target, slot_t slot)
                                case SLOT1: return 5;
                                case SLOT_LAST: return info->dramsize-1;
                        }
+                       break;
                case 64:
                        switch (slot) {
                                case SLOT0: return 4;
@@ -1787,6 +1788,8 @@ static riscv_error_t handle_halt_routine(struct target *target)
                                        break;
                                default:
                                        assert(0);
+                                       LOG_ERROR("Got invalid register result %d", result);
+                                       goto error;
                        }
                        if (riscv_xlen(target) == 32) {
                                reg_cache_set(target, reg, data & 0xffffffff);
@@ -1803,6 +1806,8 @@ static riscv_error_t handle_halt_routine(struct target *target)
                }
        }
 
+       scans_delete(scans);
+
        if (dbus_busy) {
                increase_dbus_busy_delay(target);
                return RE_AGAIN;
@@ -1816,8 +1821,6 @@ static riscv_error_t handle_halt_routine(struct target *target)
        info->dpc = reg_cache_get(target, CSR_DPC);
        info->dcsr = reg_cache_get(target, CSR_DCSR);
 
-       scans_delete(scans);
-
        cache_invalidate(target);
 
        return RE_OK;