Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make diag msg on conversion error in Id3v2FrameMaker more specific

This commit is contained in:
Martchus 2018-06-02 19:29:43 +02:00
parent ba23b49d39
commit 878b3a3c4e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
id3/id3v2frame.cpp
View File

@ -362,7 +362,8 @@ Id3v2FrameMaker::Id3v2FrameMaker(Id3v2Frame &frame, byte version, Diagnostics &d
const string context("making " % m_frame.frameIdString() + " frame");
// validate assigned data
if (m_frame.value().isEmpty()) {
const auto value(m_frame.value());
if (value.isEmpty()) {
diag.emplace_back(DiagLevel::Critical, "Cannot make an empty frame.", context);
throw InvalidDataException();
}
@ -461,7 +462,12 @@ Id3v2FrameMaker::Id3v2FrameMaker(Id3v2Frame &frame, byte version, Diagnostics &d
copy(m_frame.value().dataPointer(), m_frame.value().dataPointer() + m_decompressedSize, m_data.get());
}
} catch (const ConversionException &) {
diag.emplace_back(DiagLevel::Critical, "Assigned value can not be converted appropriately.", context);
try {
diag.emplace_back(DiagLevel::Critical,
argsToString("Assigned value \"", value.toString(TagTextEncoding::Utf8), "\" can not be converted appropriately."), context);
} catch (const ConversionException &) {
diag.emplace_back(DiagLevel::Critical, "Assigned value can not be converted appropriately.", context);
}
throw InvalidDataException();
}