oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/openmpt: catch libopenmpt exceptions in scan_stream()

Browse Source 
Fixes crash bug.
This commit is contained in:
Max Kellermann 2021-10-06 20:13:03 +02:00
parent 2dacb36789
commit 5d35983298
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/decoder/plugins/OpenmptDecoderPlugin.cxx
View File

@ -126,7 +126,7 @@ mod_decode(DecoderClient &client, InputStream &is)
static bool static bool
openmpt_scan_stream(InputStream &is, TagHandler &handler) noexcept openmpt_scan_stream(InputStream &is, TagHandler &handler) noexcept
{ try {
const auto buffer = mod_loadfile(&openmpt_domain, nullptr, is); const auto buffer = mod_loadfile(&openmpt_domain, nullptr, is);
if (buffer.IsNull()) { if (buffer.IsNull()) {
LogWarning(openmpt_domain, "could not load stream"); LogWarning(openmpt_domain, "could not load stream");
@ -145,6 +145,13 @@ openmpt_scan_stream(InputStream &is, TagHandler &handler) noexcept
handler.OnTag(TAG_PERFORMER, mod.get_metadata("tracker").c_str()); handler.OnTag(TAG_PERFORMER, mod.get_metadata("tracker").c_str());
return true; return true;
} catch (...) {
/* libopenmpt usually throws openmpt::exception, but "may
additionally throw any exception thrown by the standard
library which are all derived from std::exception", we
let's just catch all here */
LogError(std::current_exception(), "libopenmpt failed");
return false;
} }
static const char *const mod_suffixes[] = { static const char *const mod_suffixes[] = {