9 files changed, 14 insertions, 28 deletions

diff --git a/apps/action.c b/apps/action.c
index da08e29dbb..8c03ca4d65 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -1219,8 +1219,7 @@ int action_set_keymap_handle(int handle, int count)
     return -1;
 #else
     /* free an existing remap */
-    if (action_last.key_remap > 0)
-        action_last.key_remap = core_free(action_last.key_remap);
+    action_last.key_remap = core_free(action_last.key_remap);
 
     /* if clearing the remap, we're done */
     if (count <= 0 || handle <= 0)
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index b034f25df0..d17668ade5 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -520,8 +520,7 @@ static int bf_action_cb(int action, struct gui_synclist* list)
             /* for some reason simplelist doesn't allow adding items here if
              * info.get_name is given, so use normal list api */
             gui_synclist_set_nb_items(list, core_get_num_blocks());
-            if (handle > 0)
-                core_free(handle);
+            core_free(handle);
         }
         action = ACTION_REDRAW;
     }
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index 146dccb18a..1def0812da 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -267,8 +267,7 @@ void skin_backdrop_unload(int backdrop_id)
     backdrops[backdrop_id].ref_count--;
     if (backdrops[backdrop_id].ref_count <= 0)
     {
-        if (backdrops[backdrop_id].buflib_handle > 0)
-            core_free(backdrops[backdrop_id].buflib_handle);
+        core_free(backdrops[backdrop_id].buflib_handle);
         backdrops[backdrop_id].buffer = NULL;
         backdrops[backdrop_id].buflib_handle = -1;
         backdrops[backdrop_id].loaded = false;
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 6021f0647c..26a251bb4b 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1829,9 +1829,7 @@ void skin_data_free_buflib_allocs(struct wps_data *wps_data)
 abort:
     wps_data->font_ids = PTRTOSKINOFFSET(skin_buffer, NULL); /* Safe if skin_buffer is NULL */
     wps_data->images = PTRTOSKINOFFSET(skin_buffer, NULL);
-    if (wps_data->buflib_handle > 0)
-        core_free(wps_data->buflib_handle);
-    wps_data->buflib_handle = -1;
+    wps_data->buflib_handle = core_free(wps_data->buflib_handle);
 #endif
 }
 
diff --git a/apps/playback.c b/apps/playback.c
index 7fdb302d71..9b67f2ccc7 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -3683,8 +3683,7 @@ void audio_hard_stop(void)
 #ifdef PLAYBACK_VOICE
     voice_stop();
 #endif
-    if (audiobuf_handle > 0)
-        audiobuf_handle = core_free(audiobuf_handle);
+    audiobuf_handle = core_free(audiobuf_handle);
 }
 
 /* Resume playback if paused */
diff --git a/apps/plugin.c b/apps/plugin.c
index 888a9e109c..4016040c5a 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -839,8 +839,7 @@ int plugin_load(const char* plugin, const void* parameter)
         }
         lc_close(current_plugin_handle);
         current_plugin_handle = pfn_tsr_exit = NULL;
-        if (plugin_buffer_handle > 0)
-            plugin_buffer_handle = core_free(plugin_buffer_handle);
+        plugin_buffer_handle = core_free(plugin_buffer_handle);
     }
 
     splash(0, ID2P(LANG_WAIT));
@@ -921,8 +920,7 @@ int plugin_load(const char* plugin, const void* parameter)
     {   /* close handle if plugin is no tsr one */
         lc_close(current_plugin_handle);
         current_plugin_handle = NULL;
-        if (plugin_buffer_handle > 0)
-            plugin_buffer_handle = core_free(plugin_buffer_handle);
+        plugin_buffer_handle = core_free(plugin_buffer_handle);
     }
 
     talk_buffer_set_policy(TALK_BUFFER_DEFAULT);
diff --git a/apps/rbcodec_helpers.c b/apps/rbcodec_helpers.c
index 78e068ded7..b856d7355d 100644
--- a/apps/rbcodec_helpers.c
+++ b/apps/rbcodec_helpers.c
@@ -87,10 +87,7 @@ void tdspeed_free_buffers(int32_t **buffers, int nbuf)
 {
     for (int i = 0; i < nbuf; i++)
     {
-        if (handles[i] > 0)
-            core_free(handles[i]);
-
-        handles[i] = 0;
+        handles[i] = core_free(handles[i]);
         buffers[i] = NULL;
     }
 }
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index 0f6e8469ec..d3d45d3e1c 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -1437,8 +1437,7 @@ static void on_close_recording(void)
     audio_set_output_source(AUDIO_SRC_PLAYBACK);
     pcm_apply_settings();
 
-    if (pcmrec_handle > 0)
-        pcmrec_handle = core_free(pcmrec_handle);
+    pcmrec_handle = core_free(pcmrec_handle);
     talk_buffer_set_policy(TALK_BUFFER_DEFAULT);
 
     send_event(RECORDING_EVENT_STOP, NULL);
diff --git a/apps/talk.c b/apps/talk.c
index 1be2a041c2..a7af58c273 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -226,7 +226,7 @@ static int shrink_callback(int handle, unsigned hints, void *start, size_t old_s
 
         mutex_lock(&read_buffer_mutex);
         /* the clip buffer isn't usable without index table */
-        if (handle == index_handle && talk_handle > 0)
+        if (handle == index_handle)
             talk_handle = core_free(talk_handle);
         if (h)
             *h = core_free(handle);
@@ -546,8 +546,7 @@ static bool create_clip_buffer(size_t max_size)
 
 alloc_err:
     talk_status = TALK_STATUS_ERR_ALLOC;
-    if (index_handle > 0)
-        index_handle = core_free(index_handle);
+    index_handle = core_free(index_handle);
     return false;
 }
 static inline int load_voicefile_failure(int fd)
@@ -621,8 +620,7 @@ static bool load_voicefile_data(int fd)
 
     /* just allocate, populate on an as-needed basis later
      * re-create the clip buffer to ensure clip_ctx is up-to-date */
-    if (talk_handle > 0)
-        talk_handle = core_free(talk_handle);
+    talk_handle = core_free(talk_handle);
     if (!create_clip_buffer(voicebuf_size))
         return false;
 
@@ -823,8 +821,8 @@ void talk_init(void)
     voicefile_size = has_voicefile = 0;
     /* need to free these as their size depends on the voice file, and
      * this function is called when the talk voice file changes */
-    if (index_handle > 0) index_handle = core_free(index_handle);
-    if (talk_handle  > 0) talk_handle  = core_free(talk_handle);
+    index_handle = core_free(index_handle);
+    talk_handle  = core_free(talk_handle);
     /* don't free thumb handle, it doesn't depend on the actual voice file
      * and so we can re-use it if it's already allocated in any event */