aboutsummaryrefslogtreecommitdiff
path: root/src/target/cortex_m.c
diff options
context:
space:
mode:
authorMarc Schink <openocd-dev@marcschink.de>2015-06-30 09:40:28 +0200
committerSpencer Oliver <spen@spen-soft.co.uk>2015-09-30 22:13:50 +0100
commitb01b5fe13a67d6ff33b792348c24c5f92a5a8a1b (patch)
treed2558ab2735648ba4829e1a4e92a676941af14f8 /src/target/cortex_m.c
parent33e406824c5d522703829189bb0f55967b887ec5 (diff)
downloadriscv-openocd-b01b5fe13a67d6ff33b792348c24c5f92a5a8a1b.zip
riscv-openocd-b01b5fe13a67d6ff33b792348c24c5f92a5a8a1b.tar.gz
riscv-openocd-b01b5fe13a67d6ff33b792348c24c5f92a5a8a1b.tar.bz2
armv7m: Fix memory leak in register caching.
Change-Id: I184042d277a52f3940d6d6c13f3d94afc557933d Signed-off-by: Marc Schink <openocd-dev@marcschink.de> [andreas.fritiofson@gmail.com: don't check pointers before free()] Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Reviewed-on: http://openocd.zylin.com/2881 Tested-by: jenkins
Diffstat (limited to 'src/target/cortex_m.c')
-rw-r--r--src/target/cortex_m.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 2cb83a4..8795671 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1694,7 +1694,10 @@ void cortex_m_deinit_target(struct target *target)
struct cortex_m_common *cortex_m = target_to_cm(target);
free(cortex_m->fp_comparator_list);
+
cortex_m_dwt_free(target);
+ armv7m_free_reg_cache(target);
+
free(cortex_m);
}
@@ -1924,10 +1927,14 @@ int cortex_m_examine(struct target *target)
armv7m->arm.core_cache->num_regs > ARMV7M_NUM_CORE_REGS_NOFP) {
/* free unavailable FPU registers */
size_t idx;
+
for (idx = ARMV7M_NUM_CORE_REGS_NOFP;
idx < armv7m->arm.core_cache->num_regs;
- idx++)
+ idx++) {
free(armv7m->arm.core_cache->reg_list[idx].value);
+ free(armv7m->arm.core_cache->reg_list[idx].feature);
+ free(armv7m->arm.core_cache->reg_list[idx].reg_data_type);
+ }
armv7m->arm.core_cache->num_regs = ARMV7M_NUM_CORE_REGS_NOFP;
}