SHERLOCK: Fix memory leak playing music

scummvm · Oct 11, 2015 · 0a1f5db · 0a1f5db
1 parent ac24e87
commit 0a1f5db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
@@ -225,6 +225,7 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_musicOn = false;
 	_midiOption = false;
 	_musicVolume = 0;
+	_midiMusicData = nullptr;
 
 	if (IS_3DO) {
 		// 3DO - uses digital samples for music
@@ -470,8 +471,8 @@ bool Music::playMusic(const Common::String &name) {
 			}
 		}
 
+		_midiMusicData = midiMusicData;
 		_midiParser->loadMusic(midiMusicData, midiMusicDataSize);
-
 	} else {
 		// 3DO: sample based
 		Audio::AudioStream *musicStream;
@@ -517,6 +518,8 @@ void Music::freeSong() {
 		_midiParser->unloadMusic();
 	}
 
+	delete[] _midiMusicData;
+	_midiMusicData = nullptr;
 	_musicPlaying = false;
 }
 

diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h
@@ -68,6 +68,7 @@ class Music {
 	MidiDriver *_midiDriver;
 	Audio::SoundHandle _digitalMusicHandle;
 	MusicType _musicType;
+	byte *_midiMusicData;
 
 	/**
 	 * Play the specified music resource