interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

David Brownell <david-b@pacbell.net>: 

Fix a memory leak in jtag_tap_free():  unregister the event
callback too.

Also fix the associated conceptual bug in unregistering JTAG
event callbacks:  since the same callback procedure is used
many times with different callback data (a TAP handle), that
data must be considered when unregistering any callback.

This could fix some crashes after TAP registration errors,
by making sure the reset event handler doesn't scribble over
memory that's now used by something else.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2245 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-16 00:22:52 +00:00
parent c7cfb3417b
commit 03803a9d79
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/jtag/core.c
View File

@ -243,24 +243,30 @@ int jtag_register_event_callback(jtag_event_handler_t callback, void *priv)
return ERROR_OK; return ERROR_OK;
} }
int jtag_unregister_event_callback(jtag_event_handler_t callback) int jtag_unregister_event_callback(jtag_event_handler_t callback, void *priv)
{ {
jtag_event_callback_t **callbacks_p = &jtag_event_callbacks; jtag_event_callback_t **callbacks_p;
jtag_event_callback_t **next;
if (callback == NULL) if (callback == NULL)
{ {
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
} }
while (*callbacks_p) for (callbacks_p = &jtag_event_callbacks;
*callbacks_p != NULL;
callbacks_p = next)
{ {
jtag_event_callback_t **next = &((*callbacks_p)->next); next = &((*callbacks_p)->next);
if ((*callbacks_p)->priv != priv)
continue;
if ((*callbacks_p)->callback == callback) if ((*callbacks_p)->callback == callback)
{ {
free(*callbacks_p); free(*callbacks_p);
*callbacks_p = *next; *callbacks_p = *next;
} }
callbacks_p = next;
} }
return ERROR_OK; return ERROR_OK;
@ -1092,6 +1098,8 @@ void jtag_tap_init(jtag_tap_t *tap)
void jtag_tap_free(jtag_tap_t *tap) void jtag_tap_free(jtag_tap_t *tap)
{ {
jtag_unregister_event_callback(&jtag_reset_callback, tap);
/// @todo is anything missing? no memory leaks please /// @todo is anything missing? no memory leaks please
free((void *)tap->expected_ids); free((void *)tap->expected_ids);
free((void *)tap->chip); free((void *)tap->chip);

2
src/jtag/jtag.h
View File

@ -230,7 +230,7 @@ struct jtag_tap_event_action_s
typedef int (*jtag_event_handler_t)(enum jtag_event event, void* priv); typedef int (*jtag_event_handler_t)(enum jtag_event event, void* priv);
extern int jtag_register_event_callback(jtag_event_handler_t f, void *x); extern int jtag_register_event_callback(jtag_event_handler_t f, void *x);
extern int jtag_unregister_event_callback(jtag_event_handler_t f); extern int jtag_unregister_event_callback(jtag_event_handler_t f, void *x);
extern int jtag_call_event_callbacks(enum jtag_event event); extern int jtag_call_event_callbacks(enum jtag_event event);