- Yay! We now seem to be free of memory leaks! The next step will be to

merge a lot of these static destructor-only structs into regular
  functions added to the exit chain with atterm so that they can be called
  in a deterministic order and not whatever order the linker decides to put
  them in. (Interestingly, the amount of memory used when repeatedly
  executing the same map command at the console varies up and down, but it
  now stays relatively stable rather than increasing unbounded.)
- Fixed: The list of resolutions in the video modes menu was not freed
  at exit.
- Fixed: mus_playing.name was not freed at exit.
- Fixed: SN_StopAllSequences() should be called at the start of
  P_FreeLevelData(), not just before the call to P_SetupLevel() in
  G_DoLoadLevel(), so it can run even at exit. And C_FullConsole() can
  call P_FreeLevelData() to free more memory too.
- Fixed: StatusBar was not freed at exit.
- Fixed: spritesorter was not freed at exit.
- Fixed: Bad things happened if FString's data pool was destroyed before
  all C_RemoveTabCommand() calls were made.
- Added an overload for FArchive << FString.
- Fixed: The players' log text was not freed at exit.
- Fixed: Bot information was not freed at exit.
- Fixed: doomcom was not freed at exit. But since it's always created,
  there's no reason why it needs to be allocated from the heap. My guess
  is that in the DOS days, the external packet driver was responsible for
  allocating doomcom and passed its location with the -net parameter.
- Fixed: FBlockNodes were not freed at exit.
- Fixed: Openings were not freed at exit.
- Fixed: Drawsegs were not freed at exit.
- Fixed: Vissprites were not freed at exit.
- Fixed: Console command history was not freed at exit.
- Fixed: Visplanes were not freed at exit.
- Fixed: Call P_FreeLevelData() at exit.
- Fixed: Channel, SoundCurve, and PlayList in s_sound.cpp were not freed at
  exit.
- Fixed: Sound sequences were not freed at exit.
- Fixed: DSeqNode::Serialize() did not resize the m_SequenceChoices array
  when loading.


SVN r106 (trunk)

src/s_sound.cpp

@@ -116,7 +116,7 @@ typedef struct
 
 struct MusPlayingInfo
 {
-	char *name;
+	FString name;
 	void *handle;
 	int   baseorder;
 	bool  loop;
@@ -144,7 +144,7 @@ int MAX_SND_DIST;
 static channel_t *Channel;			// the set of channels available
 static BOOL		mus_paused;			// whether songs are paused
 static MusPlayingInfo mus_playing;	// music currently being played
-static char		*LastSong;			// last music that was played
+static FString	 LastSong;			// last music that was played
 static byte		*SoundCurve;
 static int		nextcleanup;
 static FPlayList *PlayList;
@@ -167,6 +167,29 @@ CVAR (Bool, snd_flipstereo, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 
 // CODE --------------------------------------------------------------------
 
+static struct FreeSoundData
+{
+	~FreeSoundData()
+	{
+		if (Channel != NULL)
+		{
+			delete[] Channel;
+			Channel = NULL;
+			numChannels = 0;
+		}
+		if (SoundCurve != NULL)
+		{
+			delete[] SoundCurve;
+			SoundCurve = NULL;
+		}
+		if (PlayList != NULL)
+		{
+			delete PlayList;
+			PlayList = NULL;
+		}
+	}
+} SoundDataFree_er;
+
 //==========================================================================
 //
 // P_AproxDistance2
@@ -1430,7 +1453,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
 		return false;
 	}
 
-	if (mus_playing.name && stricmp (mus_playing.name, musicname) == 0)
+	if (!mus_playing.name.IsEmpty() && stricmp (mus_playing.name, musicname) == 0)
 	{
 		if (order != mus_playing.baseorder)
 		{
@@ -1451,10 +1474,6 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
 			id = strtoul (more+1, NULL, 16);
 		}
 		S_StopMusic (true);
-		if (mus_playing.name)
-		{
-			delete[] mus_playing.name;
-		}
 		mus_playing.handle = I_RegisterCDSong (track, id);
 	}
 	else
@@ -1498,15 +1517,6 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
 		S_StopMusic (true);
 
 		// load & register it
-
-		// Note by Graf Zahl: S_StopMusic NULLs this variable so there's nothing to delete anymore!
-		/*
-		if (mus_playing.name)
-		{
-			delete[] mus_playing.name;
-		}
-		*/
-
 		if (offset!=-1)
 		{
 			mus_playing.handle = I_RegisterSong (lumpnum != -1 ?
@@ -1525,7 +1535,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
 
 	if (mus_playing.handle != 0)
 	{ // play it
-		mus_playing.name = copystring (musicname);
+		mus_playing.name = musicname;
 		I_PlaySong (mus_playing.handle, looping, S_GetMusicVolume (musicname));
 		mus_playing.baseorder =
 			(I_SetSongPosition (mus_playing.handle, order) ? order : 0);
@@ -1543,11 +1553,10 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
 
 void S_RestartMusic ()
 {
-	if (LastSong != NULL)
+	if (!LastSong.IsEmpty())
 	{
 		S_ChangeMusic (LastSong, mus_playing.baseorder, mus_playing.loop, true);
-		delete[] LastSong;
-		LastSong = NULL;
+		LastSong = "";
 	}
 }
 
@@ -1583,7 +1592,7 @@ int S_GetMusic (char **name)
 void S_StopMusic (bool force)
 {
 	// [RH] Don't stop if a playlist is active.
-	if ((force || PlayList == NULL) && mus_playing.name)
+	if ((force || PlayList == NULL) && !mus_playing.name.IsEmpty())
 	{
 		if (mus_paused)
 			I_ResumeSong(mus_playing.handle);
@@ -1591,13 +1600,8 @@ void S_StopMusic (bool force)
 		I_StopSong(mus_playing.handle);
 		I_UnRegisterSong(mus_playing.handle);
 
-		if (LastSong)
-		{
-			delete[] LastSong;
-		}
-
 		LastSong = mus_playing.name;
-		mus_playing.name = NULL;
+		mus_playing.name = "";
 		mus_playing.handle = 0;
 	}
 }