loadSettings - Reallocate memory for custom states to avoid fragmentation

Author: Zephiles

ttyd-tools/rel/source/memcard.cpp

@@ -620,51 +620,66 @@ int32_t loadSettings(int32_t memoryCardSlot)
         FrameAdvance.FrameAdvanceButtonCombos.PauseButtonCombo = ButtonCombo;
     }
 
+    // Get the hit check visualization data
+    HitCheck.Settings.DrawHits = Settings->HitCheckSettings.DrawHits;
+    HitCheck.Settings.DrawMisses = Settings->HitCheckSettings.DrawMisses;
+    
+    // Only get the colors if their alphas are not 0
+    uint32_t HitsColor = Settings->HitCheckSettings.HitsColor;
+    if ((HitsColor & 0xFF) != 0)
+    {
+        HitCheck.Settings.HitsColor = HitsColor;
+    }
+    
+    uint32_t MissesColor = Settings->HitCheckSettings.MissesColor;
+    if ((MissesColor & 0xFF) != 0)
+    {
+        HitCheck.Settings.MissesColor = MissesColor;
+    }
+    
     // Get the custom states
+    // If there were any previously, then delete them
+    CustomStateStruct *CustomStates = CustomState.State;
+    if (CustomStates)
+    {
+        delete[] (CustomStates);
+        CustomState.State = nullptr;
+    }
+    
     uint32_t tempTotalCustomStates = Settings->CustomStateSettings.CustomStateCount;
+    uint32_t tempTotalCustomStatesSize;
+    CustomStateStruct *tempState;
+    
     if (tempTotalCustomStates > 0)
     {
         if (tempTotalCustomStates > CUSTOM_STATES_MAX_COUNT)
         {
             tempTotalCustomStates = CUSTOM_STATES_MAX_COUNT;
         }
 
-        CustomState.TotalEntries = tempTotalCustomStates;
-        CustomState.StateWasSelected = false;
-        
-        CustomStateStruct *tempState = CustomState.State;
-        if (tempState)
-        {
-            delete[] (tempState);
-        }
-        
-        tempState = new CustomStateStruct[tempTotalCustomStates];
-        CustomState.State = tempState;
+        tempTotalCustomStatesSize = sizeof(CustomStateStruct) * tempTotalCustomStates;
 
         CustomStateStruct *CustomStatesSettings = reinterpret_cast<CustomStateStruct *>(
             reinterpret_cast<uint32_t>(Settings) + Settings->CustomStateSettings.OffsetToCustomStates);
 
-        memcpy(tempState, CustomStatesSettings, sizeof(CustomStateStruct) * tempTotalCustomStates);
+        tempState = new CustomStateStruct[tempTotalCustomStates];
+        memcpy(tempState, CustomStatesSettings, tempTotalCustomStatesSize);
     }
 
-    // Get the hit check visualization data
-    HitCheck.Settings.DrawHits = Settings->HitCheckSettings.DrawHits;
-    HitCheck.Settings.DrawMisses = Settings->HitCheckSettings.DrawMisses;
-    
-    // Only get the colors if their alphas are not 0
-    uint32_t HitsColor = Settings->HitCheckSettings.HitsColor;
-    if ((HitsColor & 0xFF) != 0)
-    {
-        HitCheck.Settings.HitsColor = HitsColor;
-    }
+    delete[] (MiscData);
 
-    uint32_t MissesColor = Settings->HitCheckSettings.MissesColor;
-    if ((MissesColor & 0xFF) != 0)
+    // If there are any custom states, reallocate memory for them now to avoid fragmentation
+    if (tempTotalCustomStates > 0)
     {
-        HitCheck.Settings.MissesColor = MissesColor;
+        CustomStates = new CustomStateStruct[tempTotalCustomStates];
+        
+        CustomState.State = CustomStates;
+        CustomState.TotalEntries = static_cast<uint8_t>(tempTotalCustomStates);
+        memcpy(CustomStates, tempState, tempTotalCustomStatesSize);
+        
+        delete[] (tempState);
     }
 
-    delete[] (MiscData);
     return CARD_RESULT_READY;
 }