From 12ef045fdf5a9e2b4d5618cc3b7ba50ecc0ccf69 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sat, 15 Oct 2022 09:08:09 -0400 Subject: move buflib_free invalid handle check to the function allow buflib_free to check for invalid or already freed handles within the function -- remove all the invalid handle guards thru core_free Change-Id: Ibdcbc82760fc93b674c42283fca420d94907df8e --- firmware/common/zip.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'firmware/common/zip.c') diff --git a/firmware/common/zip.c b/firmware/common/zip.c index 36b90a9223..22c6226e3b 100644 --- a/firmware/common/zip.c +++ b/firmware/common/zip.c @@ -237,8 +237,7 @@ static int zip_read_ed(struct zip* z) { rv = 0; bail: - if (mem_handle >= 0) - core_free(mem_handle); + core_free(mem_handle); return rv; } @@ -337,10 +336,9 @@ static int zip_read_cd(struct zip* z, bool use_cb) { rv = 0; bail: - if (rv != 0 && cds_handle >= 0) + if (rv != 0) core_free(cds_handle); - if (mem_handle >= 0) - core_free(mem_handle); + core_free(mem_handle); return rv; } @@ -497,8 +495,7 @@ static int zip_read_entries(struct zip* z) { rv = 0; bail: - if (mem_handle >= 0) - core_free(mem_handle); + core_free(mem_handle); return rv; } @@ -754,10 +751,8 @@ struct zip* zip_open(const char* name, bool try_mem) { bail: if (file >= 0) close(file); - if (mem_handle >= 0) - core_free(mem_handle); - if (zip_handle >= 0) - core_free(zip_handle); + core_free(mem_handle); + core_free(zip_handle); return NULL; } @@ -875,8 +870,7 @@ void zip_close(struct zip* z) { z->close(z); - if (z->cds_handle >= 0) - core_free(z->cds_handle); + core_free(z->cds_handle); core_free(z->zip_handle); } -- cgit v1.2.3