mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-03 00:58:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Discard empty ID3v2 frames instead of adding a dummy null byte.

Browse Source
This commit is contained in:
Tsuda Kageyu 2015-03-24 10:31:52 +09:00
parent 4c4be0a263
commit d33d684fab
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taglib/mpeg/id3v2/id3v2frame.cpp
View File

@ -193,9 +193,6 @@ void Frame::setText(const String &)
ByteVector Frame::render() const
{
ByteVector fieldData = renderFields();
if(fieldData.isEmpty())
fieldData = ByteVector("\x00", 1);
d->header->setFrameSize(fieldData.size());
ByteVector headerData = d->header->render();

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

@ -591,12 +591,19 @@ ByteVector ID3v2::Tag::render(int version) const
for(FrameList::ConstIterator it = frameList.begin(); it != frameList.end(); it++) {
(*it)->header()->setVersion(version);
if((*it)->header()->frameID().size() != 4) {
debug("A frame of unsupported or unknown type \'"
debug("An ID3v2 frame of unsupported or unknown type \'"
+ String((*it)->header()->frameID()) + "\' has been discarded");
continue;
}
if(!(*it)->header()->tagAlterPreservation())
if(!(*it)->header()->tagAlterPreservation()) {
const ByteVector frameData = (*it)->render();
if(frameData.size() == Frame::headerSize()) {
debug("An empty ID3v2 frame \'"
+ String((*it)->header()->frameID()) + "\' has been discarded");
continue;
}
tagData.append((*it)->render());
}
}
// Compute the amount of padding, and append that to tagData.