Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15886) -Fix [FS#2770]: libtimidity cannot handle frees of NULL (in contrast of most other frees)

Browse Source
This commit is contained in:
rubidium 2009-03-29 10:52:54 +00:00
parent bbd546b792
commit 7c5ffdc354
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/music/libtimidity.cpp
View File

@ -50,6 +50,7 @@ static FMusicDriver_LibTimidity iFMusicDriver_LibTimidity;
const char *MusicDriver_LibTimidity::Start(const char * const *param) const char *MusicDriver_LibTimidity::Start(const char * const *param)
{ {
_midi.status = MIDI_STOPPED; _midi.status = MIDI_STOPPED;
_midi.song = NULL;
if (mid_init(param == NULL ? NULL : (char *)param[0]) < 0) { if (mid_init(param == NULL ? NULL : (char *)param[0]) < 0) {
/* If init fails, it can be because no configuration was found. /* If init fails, it can be because no configuration was found.
@ -81,15 +82,14 @@ const char *MusicDriver_LibTimidity::Start(const char * const *param)
void MusicDriver_LibTimidity::Stop() void MusicDriver_LibTimidity::Stop()
{ {
if (_midi.status == MIDI_PLAYING) { if (_midi.status == MIDI_PLAYING) this->StopSong();
_midi.status = MIDI_STOPPED;
mid_song_free(_midi.song);
}
mid_exit(); mid_exit();
} }
void MusicDriver_LibTimidity::PlaySong(const char *filename) void MusicDriver_LibTimidity::PlaySong(const char *filename)
{ {
this->StopSong();
_midi.stream = mid_istream_open_file(filename); _midi.stream = mid_istream_open_file(filename);
if (_midi.stream == NULL) { if (_midi.stream == NULL) {
DEBUG(driver, 0, "Could not open music file"); DEBUG(driver, 0, "Could not open music file");
@ -112,7 +112,9 @@ void MusicDriver_LibTimidity::PlaySong(const char *filename)
void MusicDriver_LibTimidity::StopSong() void MusicDriver_LibTimidity::StopSong()
{ {
_midi.status = MIDI_STOPPED; _midi.status = MIDI_STOPPED;
mid_song_free(_midi.song); /* mid_song_free cannot handle NULL! */
if (_midi.song != NULL) mid_song_free(_midi.song);
_midi.song = NULL;
} }
bool MusicDriver_LibTimidity::IsSongPlaying() bool MusicDriver_LibTimidity::IsSongPlaying()
@ -130,6 +132,5 @@ bool MusicDriver_LibTimidity::IsSongPlaying()
void MusicDriver_LibTimidity::SetVolume(byte vol) void MusicDriver_LibTimidity::SetVolume(byte vol)
{ {
if (_midi.song != NULL) if (_midi.song != NULL) mid_song_set_volume(_midi.song, vol);
mid_song_set_volume(_midi.song, vol);
} }