imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target: Fix memory leak 

Change-Id: Ib23dfd653d8edacb890a46179e9d437c027d58e8
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/4048
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Chengyu Zheng <chengyu.zheng@polimi.it>
Reviewed-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Marc Schink 2017-01-08 20:19:29 +01:00 committed by Freddie Chopin
parent 568e84236b
commit 518fcd3883
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/target/target.c
View File

@ -1870,6 +1870,17 @@ int target_free_working_area(struct target *target, struct working_area *area)
return target_free_working_area_restore(target, area, 1);
}
static void target_destroy(struct target *target)
{
if (target->type->deinit_target)
target->type->deinit_target(target);
free(target->type);
free(target->trace_info);
free(target->cmd_name);
free(target);
}
void target_quit(void)
{
struct target_event_callback *pe = target_event_callbacks;
@ -1888,11 +1899,15 @@ void target_quit(void)
}
target_timer_callbacks = NULL;
for (struct target *target = all_targets;
target; target = target->next) {
if (target->type->deinit_target)
target->type->deinit_target(target);
for (struct target *target = all_targets; target;) {
struct target *tmp;
tmp = target->next;
target_destroy(target);
target = tmp;
}
all_targets = NULL;
}
/* free resources and restore memory, if restoring memory fails,

2
src/target/target.h
View File

@ -125,7 +125,7 @@ enum target_register_class {
/* target_type.h contains the full definition of struct target_type */
struct target {
struct target_type *type; /* target type definition (name, access functions) */
const char *cmd_name; /* tcl Name of target */
char *cmd_name; /* tcl Name of target */
int target_number; /* DO NOT USE! field to be removed in 2010 */
struct jtag_tap *tap; /* where on the jtag chain is this */
int32_t coreid; /* which device on the TAP? */