[openwrt/openwrt] firmware-utils/hcsmakeimage: fix possible memory leak and resource leaks

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 8 10:07:38 EDT 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/d64b20da21d796334840fe9614bb0cb572e22fda

commit d64b20da21d796334840fe9614bb0cb572e22fda
Author: Andrea Dalla Costa <andrea at dallacosta.me>
AuthorDate: Sat Jan 11 22:57:58 2020 +0100

    firmware-utils/hcsmakeimage: fix possible memory leak and resource leaks
    
    Add missing calls to `free` for variable `filebuffer`.
    Add missing calls to `fclose` for variables `fd` and `fd_out`.
    
    Signed-off-by: Andrea Dalla Costa <andrea at dallacosta.me>
---
 tools/firmware-utils/src/hcsmakeimage.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/firmware-utils/src/hcsmakeimage.c b/tools/firmware-utils/src/hcsmakeimage.c
index 7baa7b5845..2888810cc7 100644
--- a/tools/firmware-utils/src/hcsmakeimage.c
+++ b/tools/firmware-utils/src/hcsmakeimage.c
@@ -183,6 +183,7 @@ int main ( int argc, char** argv )
 	char* filebuffer = malloc ( buf.st_size+10 );
 	FILE* fd = fopen ( input,"r" );
 	fread ( filebuffer, 1, buf.st_size,fd );
+	fclose (fd);
 	if (!output)
 		{
 		output = malloc(strlen(input+5));
@@ -194,10 +195,13 @@ int main ( int argc, char** argv )
 	if (!fd_out)
 		{
 		fprintf(stderr, "Failed to open output file: %s\n", output);
+		free(filebuffer);
 		exit(1);
 		}
 	fwrite ( head,1,sizeof ( ldr_header_t ),fd_out );
 	fwrite ( filebuffer,1,buf.st_size,fd_out );
 	printf("Firmware image %s is ready\n", output);
+	free(filebuffer);
+	fclose(fd_out);
 	return 0;
 }



More information about the lede-commits mailing list