mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Utils: Fix potential ID3v1 false positive in the presence of an APE tag.

Browse Source
This commit is contained in:
James D. Smith 2022-03-10 10:52:02 -07:00 committed by Urs Fleisch
parent 197d2a684b
commit cebaf9a8e2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
taglib/tagutils.cpp
View File

@ -38,11 +38,22 @@ long Utils::findID3v1(File *file)
if(!file->isValid())
return -1;
file->seek(-128, File::End);
const long p = file->tell();
// Differentiate between a match of APEv2 magic and a match of ID3v1 magic.
if(file->readBlock(3) == ID3v1::Tag::fileIdentifier())
return p;
if (file->length() >= 131) {
file->seek(-131, File::End);
const long p = file->tell() + 3;
const TagLib::ByteVector data = file->readBlock(8);
if(data.containsAt(ID3v1::Tag::fileIdentifier(), 3) && (data != APE::Tag::fileIdentifier()))
return p;
} else {
file->seek(-128, File::End);
const long p = file->tell();
if(file->readBlock(3) == ID3v1::Tag::fileIdentifier())
return p;
}
return -1;
}