aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-10-26 17:15:24 +0100
committerMax Kellermann <max@duempel.org>2015-10-26 17:15:24 +0100
commita84fbbe32716ecee9c8a02b50251097fc35709ec (patch)
tree7bcbd0e72a1ed6d714ca042260d27d708bcb005b /src
parent93c97972b9cb41284f8af8b653e056484bbf4717 (diff)
downloadmpd-a84fbbe32716ecee9c8a02b50251097fc35709ec.tar.gz
mpd-a84fbbe32716ecee9c8a02b50251097fc35709ec.tar.xz
mpd-a84fbbe32716ecee9c8a02b50251097fc35709ec.zip
decoder/gme: free the gme_info_t as early as possible
Diffstat (limited to 'src')
-rw-r--r--src/decoder/plugins/GmeDecoderPlugin.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/decoder/plugins/GmeDecoderPlugin.cxx b/src/decoder/plugins/GmeDecoderPlugin.cxx
index eab655c91..bbe2596c9 100644
--- a/src/decoder/plugins/GmeDecoderPlugin.cxx
+++ b/src/decoder/plugins/GmeDecoderPlugin.cxx
@@ -156,8 +156,11 @@ gme_file_decode(Decoder &decoder, Path path_fs)
return;
}
- const SignedSongTime song_len = ti->length > 0
- ? SignedSongTime::FromMS(ti->length)
+ const int length = ti->length;
+ gme_free_info(ti);
+
+ const SignedSongTime song_len = length > 0
+ ? SignedSongTime::FromMS(length)
: SignedSongTime::Negative();
/* initialize the MPD decoder */
@@ -168,7 +171,6 @@ gme_file_decode(Decoder &decoder, Path path_fs)
SampleFormat::S16, GME_CHANNELS,
error)) {
LogError(error);
- gme_free_info(ti);
gme_delete(emu);
return;
}
@@ -179,8 +181,8 @@ gme_file_decode(Decoder &decoder, Path path_fs)
if (gme_err != nullptr)
LogWarning(gme_domain, gme_err);
- if (ti->length > 0)
- gme_set_fade(emu, ti->length);
+ if (length > 0)
+ gme_set_fade(emu, length);
/* play */
DecoderCommand cmd;
@@ -207,7 +209,6 @@ gme_file_decode(Decoder &decoder, Path path_fs)
break;
} while (cmd != DecoderCommand::STOP);
- gme_free_info(ti);
gme_delete(emu);
}