mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-20 22:14:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfaults when calling File::properties() after strip().

Browse Source 
Backport TagUnion::properties() and TagUnion::removeUnsupportedProperties() from taglib2.
This commit is contained in:
Tsuda Kageyu
2015-08-03 23:41:26 +09:00
parent 1bb06b1f7a
commit c5cf9b93bc
15 changed files with 253 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
taglib/wavpack/wavpackfile.cpp
View File

@ -110,26 +110,20 @@ TagLib::Tag *WavPack::File::tag() const
PropertyMap WavPack::File::properties() const
{
if(d->hasAPE)
return d->tag.access<APE::Tag>(WavAPEIndex, false)->properties();
if(d->hasID3v1)
return d->tag.access<ID3v1::Tag>(WavID3v1Index, false)->properties();
return PropertyMap();
return d->tag.properties();
}
void WavPack::File::removeUnsupportedProperties(const StringList &unsupported)
{
if(d->hasAPE)
d->tag.access<APE::Tag>(WavAPEIndex, false)->removeUnsupportedProperties(unsupported);
d->tag.removeUnsupportedProperties(unsupported);
}
PropertyMap WavPack::File::setProperties(const PropertyMap &properties)
{
if(d->hasID3v1)
d->tag.access<ID3v1::Tag>(WavID3v1Index, false)->setProperties(properties);
return d->tag.access<APE::Tag>(WavAPEIndex, true)->setProperties(properties);
if(ID3v1Tag())
ID3v1Tag()->setProperties(properties);
return APETag(true)->setProperties(properties);
}
WavPack::Properties *WavPack::File::audioProperties() const