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

Fix handling arbitrary files specified as field values 

The container offset must not be used here as it may be garbage if the file
format is not recognized (e.g. if the file is an arbitrary text file).
This commit is contained in:
Martchus 2021-05-22 23:02:55 +02:00
parent 54093af53b
commit 53f0f02c72
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/mainfeatures.cpp
View File

@ -678,6 +678,8 @@ void setTagInfo(const SetTagInfoArgs &args)
// add value from file // add value from file
const auto parts = splitStringSimple<std::vector<std::string_view>>(relevantDenotedValue->value, ":", 3); const auto parts = splitStringSimple<std::vector<std::string_view>>(relevantDenotedValue->value, ":", 3);
const auto path = parts.empty() ? std::string_view() : parts.front(); const auto path = parts.empty() ? std::string_view() : parts.front();
const auto fieldType = denotedScope.field.knownFieldForTag(tag, tagType);
const auto dataType = fieldType == KnownField::Cover ? TagDataType::Picture : TagDataType::Text;
try { try {
// assume the file refers to a picture // assume the file refers to a picture
auto value = TagValue(); auto value = TagValue();
@ -688,9 +690,9 @@ void setTagInfo(const SetTagInfoArgs &args)
coverFileInfo.open(true); coverFileInfo.open(true);
coverFileInfo.parseContainerFormat(coverDiag, coverProgress); coverFileInfo.parseContainerFormat(coverDiag, coverProgress);
auto buff = make_unique<char[]>(coverFileInfo.size()); auto buff = make_unique<char[]>(coverFileInfo.size());
coverFileInfo.stream().seekg(static_cast<streamoff>(coverFileInfo.containerOffset())); coverFileInfo.stream().seekg(static_cast<streamoff>(0));
coverFileInfo.stream().read(buff.get(), static_cast<streamoff>(coverFileInfo.size())); coverFileInfo.stream().read(buff.get(), static_cast<streamoff>(coverFileInfo.size()));
value = TagValue(std::move(buff), coverFileInfo.size(), TagDataType::Picture); value = TagValue(std::move(buff), coverFileInfo.size(), dataType, TagTextEncoding::Utf8);
value.setMimeType(coverFileInfo.mimeType()); value.setMimeType(coverFileInfo.mimeType());
} }
auto description = std::optional<std::string_view>(); auto description = std::optional<std::string_view>();
@ -698,7 +700,7 @@ void setTagInfo(const SetTagInfoArgs &args)
value.setDescription(parts[2], TagTextEncoding::Utf8); value.setDescription(parts[2], TagTextEncoding::Utf8);
description = parts[2]; description = parts[2];
} }
if (parts.size() > 1 && denotedScope.field.knownFieldForTag(tag, tagType) == KnownField::Cover if (parts.size() > 1 && fieldType == KnownField::Cover
&& (tagType == TagType::Id3v2Tag || tagType == TagType::VorbisComment)) { && (tagType == TagType::Id3v2Tag || tagType == TagType::VorbisComment)) {
const auto coverType = id3v2CoverType(parts[1]); const auto coverType = id3v2CoverType(parts[1]);
if (coverType == invalidCoverType) { if (coverType == invalidCoverType) {
@ -718,10 +720,10 @@ void setTagInfo(const SetTagInfoArgs &args)
convertedValues.emplace_back(std::move(value)); convertedValues.emplace_back(std::move(value));
} }
} catch (const TagParser::Failure &) { } catch (const TagParser::Failure &) {
diag.emplace_back(DiagLevel::Critical, "Unable to parse specified cover file.", context); diag.emplace_back(DiagLevel::Critical, "Unable to parse specified file.", context);
} catch (const std::ios_base::failure &e) { } catch (const std::ios_base::failure &e) {
diag.emplace_back(DiagLevel::Critical, diag.emplace_back(DiagLevel::Critical,
argsToString("An IO error occured when parsing the specified cover file: ", e.what()), context); argsToString("An IO error occured when parsing the specified file: ", e.what()), context);
} }
} }
// finally set the values // finally set the values