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

2 files changed, 2 insertions, 5 deletions

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
 }