mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-02-14 20:23:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #456 from TsudaKageyu/id3v2-padding

Browse Source 
ID3v2 padding won't increase beyond 1% of the file size.
This commit is contained in:
Lukáš Lalinský
2014-12-29 09:26:55 +01:00
parent 735e17f504 1a917a38cd
commit 59ae61de6e
2 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
taglib/mpeg/id3v2/id3v2tag.cpp
View File

@ -81,6 +81,11 @@ public:
static const Latin1StringHandler defaultStringHandler;
const ID3v2::Latin1StringHandler *ID3v2::Tag::TagPrivate::stringHandler = &defaultStringHandler;
namespace
{
const uint DefaultPaddingSize = 1024;
}
////////////////////////////////////////////////////////////////////////////////
// StringHandler implementation
////////////////////////////////////////////////////////////////////////////////
@ -596,15 +601,21 @@ ByteVector ID3v2::Tag::render(int version) const
// Compute the amount of padding, and append that to tagData.
uint paddingSize = 0;
uint originalSize = d->header.tagSize();
uint paddingSize = DefaultPaddingSize;
if(tagData.size() < originalSize)
paddingSize = originalSize - tagData.size();
else
paddingSize = 1024;
if(d->file && tagData.size() < d->header.tagSize()) {
paddingSize = d->header.tagSize() - tagData.size();
tagData.append(ByteVector(paddingSize, char(0)));
// Padding won't increase beyond 1% of the file size.
if(paddingSize > DefaultPaddingSize) {
const uint threshold = d->file->length() / 100; // should be ulonglong in taglib2.
if(paddingSize > threshold)
paddingSize = DefaultPaddingSize;
}
}
tagData.append(ByteVector(paddingSize, '\0'));
// Set the version and data size.
d->header.setMajorVersion(version);