Merge pull request #172 from cortex-command-community/musicman-use-after-free

Null NextSongSection properly - fix Mac/Linux crash when playing DynamicSongs

Author: Causeless

Source/Entities/DynamicSong.cpp

@@ -167,6 +167,8 @@ SoundContainer& DynamicSongSection::SelectTransitionSoundContainer() {
 }
 
 SoundContainer& DynamicSongSection::SelectSoundContainer() {
+	RTEAssert(!m_SoundContainers.empty(), "Tried to get a SoundContainer from a DynamicSongSection with none to choose from!");
+	
 	// Shuffle between our options if we have multiple
 	if (m_SoundContainers.size() > 1) {
 		if (m_ShuffleUnplayedIndices.empty()) {
@@ -199,8 +201,7 @@ SoundContainer& DynamicSongSection::SelectSoundContainer() {
 			}
 		}
 	}
-
-	RTEAssert(!m_SoundContainers.empty(), "Tried to get a SoundContainer from a DynamicSongSection with none to choose from!");
+	
 	return m_SoundContainers[0];
 }
 

Source/Managers/MusicMan.cpp

@@ -100,6 +100,7 @@ void MusicMan::ResetMusicState() {
 
 bool MusicMan::PlayDynamicSong(const std::string& songName, const std::string& songSectionType, bool playImmediately, bool playTransition, bool smoothFade) {
 	if (const DynamicSong* dynamicSongToPlay = dynamic_cast<const DynamicSong*>(g_PresetMan.GetEntityPreset("DynamicSong", songName))) {
+		m_NextSongSection = nullptr;
 		m_CurrentSong = std::unique_ptr<DynamicSong>(dynamic_cast<DynamicSong*>(dynamicSongToPlay->Clone()));
 		SetNextSongSectionType(songSectionType);
 		SelectNextSongSection();