openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 06:01:16 +02:00
Code Issues Releases Wiki Activity

Fix memleaks in cli_classic.c

Browse Source 
Frees the memory allocated for the following strings
- log file name
- layout file name
- image file name
- programmer parameter (and reset the associated global variable in flashrom.c)

Also, free the flashchip structs allocated by probe_flash.

The layout image names were not fixed due to the pending layout patches.

These bugs were found thanks to valgrind.

Corresponding to flashrom svn r1629.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner
2012-12-26 07:55:00 +00:00
parent 21541a6b22
commit b8911d6cec
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cli_classic.c
View File

@ -130,7 +130,9 @@ int main(int argc, char *argv[])
char *filename = NULL;
char *layoutfile = NULL;
#ifndef STANDALONE
char *logfile = NULL;
#endif /* !STANDALONE */
char *tempstr = NULL;
char *pparam = NULL;
@ -217,8 +219,12 @@ int main(int argc, char *argv[])
break;
case 'i':
tempstr = strdup(optarg);
if (register_include_arg(tempstr))
if (register_include_arg(tempstr)) {
free(tempstr);
cli_classic_abort_usage();
}
/* FIXME: A pointer to the image name is saved in a static array (of size MAX_ROMLAYOUT)
* by register_include_arg() and needs to be freed after processing them. */
break;
case 'L':
if (++operation_specified > 1) {
@ -337,6 +343,7 @@ int main(int argc, char *argv[])
cli_classic_abort_usage();
if (logfile && open_logfile(logfile))
return 1;
free(logfile);
#endif /* !STANDALONE */
#if CONFIG_PRINT_WIKI == 1
@ -473,6 +480,7 @@ int main(int argc, char *argv[])
}
msg_cinfo("Please note that forced reads most likely contain garbage.\n");
ret = read_flash_to_file(&flashes[0], filename);
free(flashes[0].chip);
goto out_shutdown;
}
ret = 1;
@ -517,6 +525,15 @@ int main(int argc, char *argv[])
out_shutdown:
programmer_shutdown();
out:
for (i = 0; i < chipcount; i++)
free(flashes[i].chip);
free(filename);
free(layoutfile);
free(pparam);
/* clean up global variables */
free(chip_to_probe);
chip_to_probe = NULL;
#ifndef STANDALONE
ret |= close_logfile();
#endif /* !STANDALONE */

1
flashrom.c
View File

@ -351,6 +351,7 @@ int programmer_shutdown(void)
int i = --shutdown_fn_count;
ret |= shutdown_fn[i].func(shutdown_fn[i].data);
}
programmer_param = NULL;
return ret;
}