From b986d29bc9a9b561b7a186c7c25b9243e0e46f2d Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Thu, 18 Oct 2018 10:06:23 -0700 Subject: [PATCH] Fix segfault in riscv_deinit_target(). (#306) This would happen when OpenOCD is unable to connect to the JTAG device. Change-Id: I1785fd5f5a20db9b4b574bdddfe3eab9bdc0b0bc --- src/target/riscv/riscv.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c index 0ba2e15ec..293572a66 100644 --- a/src/target/riscv/riscv.c +++ b/src/target/riscv/riscv.c @@ -280,12 +280,17 @@ static void riscv_deinit_target(struct target *target) free(info); } /* Free the shared structure use for most registers. */ - free(target->reg_cache->reg_list[0].arch_info); - /* Free the ones we allocated separately. */ - for (unsigned i = GDB_REGNO_COUNT; i < target->reg_cache->num_regs; i++) - free(target->reg_cache->reg_list[i].arch_info); - free(target->reg_cache->reg_list); - free(target->reg_cache); + if (target->reg_cache) { + if (target->reg_cache->reg_list) { + if (target->reg_cache->reg_list[0].arch_info) + free(target->reg_cache->reg_list[0].arch_info); + /* Free the ones we allocated separately. */ + for (unsigned i = GDB_REGNO_COUNT; i < target->reg_cache->num_regs; i++) + free(target->reg_cache->reg_list[i].arch_info); + free(target->reg_cache->reg_list); + } + free(target->reg_cache); + } target->arch_info = NULL; }