Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: handle possible null pointers in id3v2

Browse source
This commit is contained in:
Alexander Capehart 2025-01-07 10:02:28 -07:00
parent 447f2da294
commit 605800e9a5
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
musikr/src/main/cpp/JVMMetadataBuilder.cpp
View file

@ -35,11 +35,14 @@ void JVMMetadataBuilder::setMimeType(const std::string_view type) {
void JVMMetadataBuilder::setId3v2(const TagLib::ID3v2::Tag &tag) { void JVMMetadataBuilder::setId3v2(const TagLib::ID3v2::Tag &tag) {
for (auto frame : tag.frameList()) { for (auto frame : tag.frameList()) {
if (frame == nullptr)
continue;
if (auto txxxFrame = if (auto txxxFrame =
dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>(frame)) { dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>(frame)) {
TagLib::String id = frame->frameID(); TagLib::String id = frame->frameID();
TagLib::StringList frameText = txxxFrame->fieldList(); TagLib::StringList frameText = txxxFrame->fieldList();
// Frame text starts with the description then the remaining values if (frameText.isEmpty())
continue;
auto begin = frameText.begin(); auto begin = frameText.begin();
TagLib::String description = *begin; TagLib::String description = *begin;
frameText.erase(begin); frameText.erase(begin);