Merge pull request #515 from TsudaKageyu/empty-id3v2-frame

Skip empty ID3v2 frames when saving an ID3v2 tag.
This commit is contained in:
Scott Wheeler
2015-05-18 21:36:37 +02:00
2 changed files with 40 additions and 2 deletions

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((*it)->header()->version())) {
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.