Avoid double-frees

main/asset_loaders/fs_font.c

@@ -88,12 +88,16 @@ bool loadFont(const char* name, font_t* font, bool spiRam)
  */
 void freeFont(font_t* font)
 {
-    // using uint8_t instead of char because a char will overflow to -128 after the last char is freed (\x7f)
-    for (uint8_t idx = 0; idx <= '~' - ' ' + 1; idx++)
+    if (font->height)
     {
-        if (font->chars[idx].bitmap != NULL)
+        // using uint8_t instead of char because a char will overflow to -128 after the last char is freed (\x7f)
+        for (uint8_t idx = 0; idx <= '~' - ' ' + 1; idx++)
         {
-            heap_caps_free(font->chars[idx].bitmap);
+            if (font->chars[idx].bitmap != NULL)
+            {
+                heap_caps_free(font->chars[idx].bitmap);
+            }
         }
+        font->height = 0;
     }
 }

main/asset_loaders/fs_wsg.c

@@ -201,5 +201,10 @@ bool saveWsgNvs(const char* namespace, const char* key, const wsg_t* wsg)
  */
 void freeWsg(wsg_t* wsg)
 {
-    heap_caps_free(wsg->px);
+    if (wsg->w && wsg->h)
+    {
+        heap_caps_free(wsg->px);
+        wsg->h = 0;
+        wsg->w = 0;
+    }
 }

main/modes/games/bigbug/gameData_bigbug.c

@@ -207,6 +207,7 @@ void bb_freeGameData(bb_gameData_t* gameData)
     if(gameData->loadoutScreenData!=NULL)
     {
         heap_caps_free(gameData->loadoutScreenData);
+        gameData->loadoutScreenData = NULL;
     }
 }
 

main/modes/games/bigbug/mode_bigbug.c

@@ -1242,6 +1242,7 @@ static void bb_GameLoop_Loadout_Select(int64_t elapsedUs)
         if(bigbug->gameData.loadoutScreenData->primingEffect >= 185)
         {
             heap_caps_free(bigbug->gameData.loadoutScreenData);
+            bigbug->gameData.loadoutScreenData  = NULL;
             bigbugMode.fnBackgroundDrawCallback = bb_BackgroundDrawCallback;
             bigbug->gameData.screen             = BIGBUG_GAME;
             return;