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

log: fix memory leak when log to file is enabled 

When log to file is enabled, the file is not closed by OpenOCD at
exit. This is reported by Valgrind as a memory leak that is still
reachable, as the internal buffers of 'FILE *log_output' are freed
by the automatic fclose() at exit.

Close the log file before exit.

Change-Id: Id472c0d04462035254a9b49ecb0a4037263c6f6f
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6789
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2021-12-24 15:15:18 +01:00
parent 1536e249f2
commit 492ac453ab
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/helper/log.c
View File

@ -302,6 +302,15 @@ void log_init(void)
start = last_time = timeval_ms();
}
void log_exit(void)
{
if (log_output && log_output != stderr) {
/* Close log file, if it was open and wasn't stderr. */
fclose(log_output);
}
log_output = NULL;
}
int set_log_output(struct command_context *cmd_ctx, FILE *output)
{
log_output = output;

1
src/helper/log.h
View File

@ -72,6 +72,7 @@ __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
* Initialize logging module. Call during program startup.
*/
void log_init(void);
void log_exit(void);
int set_log_output(struct command_context *cmd_ctx, FILE *output);
int log_register_commands(struct command_context *cmd_ctx);

2
src/openocd.c
View File

@ -437,6 +437,8 @@ int openocd_main(int argc, char *argv[])
rtt_exit();
free_config();
log_exit();
if (ret == ERROR_FAIL)
return EXIT_FAILURE;
else if (ret != ERROR_OK)