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

tag/Id3: catch exceptions

Browse Source
This commit is contained in:
Max Kellermann 2016-02-19 18:23:50 +01:00
parent 98bd4dfe04
commit 8a9f04f7fe
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tag/TagId3.cxx
View File

@ -37,6 +37,7 @@
#include <id3tag.h> #include <id3tag.h>
#include <string> #include <string>
#include <stdexcept>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -507,12 +508,19 @@ bool
tag_id3_scan(Path path_fs, tag_id3_scan(Path path_fs,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
Error error; struct id3_tag *tag;
struct id3_tag *tag = tag_id3_load(path_fs, error);
if (tag == nullptr) {
if (error.IsDefined())
LogError(error);
try {
Error error;
tag = tag_id3_load(path_fs, error);
if (tag == nullptr) {
if (error.IsDefined())
LogError(error);
return false;
}
} catch (const std::runtime_error &e) {
LogError(e);
return false; return false;
} }