|
From: <ge...@op...> - 2017-03-06 21:47:33
|
This is an automated email from Gerrit. Marc Schink (ope...@ma...) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/4048 -- gerrit commit 4494c645b053571ed361f62ba8b0eb57373e4fe3 Author: Marc Schink <ope...@ma...> Date: Sun Jan 8 20:19:29 2017 +0100 target: Fix memory leak Change-Id: Ib23dfd653d8edacb890a46179e9d437c027d58e8 Signed-off-by: Marc Schink <ope...@ma...> diff --git a/src/target/target.c b/src/target/target.c index b039049..0a6c786 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -1871,6 +1871,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; @@ -1889,11 +1900,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, diff --git a/src/target/target.h b/src/target/target.h index 76630b9..53f9e26 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -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? */ -- |