2 files changed, 10 insertions, 18 deletions

diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index 7a84b761a0..8917b3348e 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -1963,8 +1963,7 @@ static int prepare_build(bool *realloced)
     int handle = reset_buffer();
     dircache_unlock();
 
-    if (handle > 0)
-        core_free(handle);
+    core_free(handle);
 
     handle = alloc_cache(size);
 
@@ -2164,8 +2163,7 @@ static void dircache_suspend_internal(bool freeit)
 
     dircache_unlock();
 
-    if (handle > 0)
-        core_free(handle);
+    core_free(handle);
 
     thread_wait(thread_id);
 
@@ -3179,7 +3177,7 @@ error:
     dircache_unlock();
 
 error_nolock:
-    if (rc < 0 && handle > 0)
+    if (rc < 0)
         core_free(handle);
 
     if (fd >= 0)
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);
 }