Common, Engine: fixed couple of memory leaks

Found by Janet Gilbert.
adventuregamestudio · Oct 27, 2016 · c5188b6 · c5188b6
1 parent 350ee86
commit c5188b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Common/gui/guilistbox.cpp b/Common/gui/guilistbox.cpp
@@ -68,6 +68,8 @@ void GUIListBox::ReadFromFile(Stream *in, GuiVersion gui_version)
   int a, i;
   char tempbuf[300];
 
+  Clear();
+
   GUIObject::ReadFromFile(in, gui_version);
   // MACPORT FIXES: swap
   in->ReadArrayOfInt32(&numItems, 11);

diff --git a/Engine/ac/game.cpp b/Engine/ac/game.cpp
@@ -2205,6 +2205,11 @@ int restore_game_data (Stream *in, const char *nametouse, SavedGameVersion svg_v
 
     ReadGameSetupStructBase_Aligned(in);
 
+    // Delete unneeded data
+    // TODO: reorganize this (may be solved by optimizing safe format too)
+    delete [] game.load_messages;
+    game.load_messages = NULL;
+
     if (game.numdialog!=numdiwas)
         quit("!Restore_Game: Game has changed (dlg), unable to restore");
     if ((numchwas != game.numcharacters) || (numinvwas != game.numinvitems))