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

Oops! We already have a function to check APE item keys.

Browse Source
This commit is contained in:
Tsuda Kageyu 2016-02-01 22:46:08 +09:00
parent 92a1a00624
commit 5350bc8501
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
taglib/ape/apetag.cpp
View File

@ -35,6 +35,7 @@
#include <tstring.h>
#include <tmap.h>
#include <tpropertymap.h>
#include <tdebug.h>
#include "apetag.h"
#include "apefooter.h"
@ -43,20 +44,6 @@
using namespace TagLib;
using namespace APE;
namespace
{
inline bool isValidItemKey(const String &key)
{
for(String::ConstIterator it = key.begin(); it != key.end(); ++it) {
const int c = static_cast<unsigned short>(*it);
if(c < 0x20 || 0x7E < c)
return false;
}
return true;
}
}
class APE::Tag::TagPrivate
{
public:
@ -283,15 +270,20 @@ PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
bool APE::Tag::checkKey(const String &key)
{
if(key.size() < 2 || key.size() > 16)
return false;
for(String::ConstIterator it = key.begin(); it != key.end(); it++) {
// only allow printable ASCII including space (32..126)
const int c = static_cast<unsigned short>(*it);
if(c < 32 || c > 126)
return false;
for(String::ConstIterator it = key.begin(); it != key.end(); it++)
// only allow printable ASCII including space (32..127)
if (*it < 32 || *it >= 128)
return false;
String upperKey = key.upper();
if (upperKey=="ID3" || upperKey=="TAG" || upperKey=="OGGS" || upperKey=="MP+")
return false;
return true;
}
const String upperKey = key.upper();
if(upperKey == "ID3" || upperKey == "TAG" || upperKey == "OGGS" || upperKey == "MP+")
return false;
return true;
}
APE::Footer *APE::Tag::footer() const
@ -311,9 +303,15 @@ void APE::Tag::removeItem(const String &key)
void APE::Tag::addValue(const String &key, const String &value, bool replace)
{
if(!checkKey(key)) {
debug("APE::Tag::addValue() - Couldn't add a value due to an invalid key.");
return;
}
if(replace)
removeItem(key);
if(!key.isEmpty() && !value.isEmpty()) {
if(!value.isEmpty()) {
if(!replace && d->itemListMap.contains(key)) {
// Text items may contain more than one value
if(APE::Item::Text == d->itemListMap.begin()->second.type())
@ -395,8 +393,12 @@ void APE::Tag::parse(const ByteVector &data)
APE::Item item;
item.parse(data.mid(pos));
if(isValidItemKey(item.key()))
if(checkKey(item.key())) {
d->itemListMap.insert(item.key().upper(), item);
}
else {
debug("APE::Tag::parse() - Skipped an item due to an invalid key.");
}
pos += item.size();
}

5
tests/test_apetag.cpp
View File

@ -97,6 +97,11 @@ public:
CPPUNIT_ASSERT_EQUAL((unsigned int)2, unsuccessful.size());
CPPUNIT_ASSERT(unsuccessful.contains("A"));
CPPUNIT_ASSERT(unsuccessful.contains("MP+"));
CPPUNIT_ASSERT_EQUAL((unsigned int)2, tag.itemListMap().size());
tag.addValue("VALID KEY", "Test Value 1");
tag.addValue("INVALID KEY \x7f", "Test Value 2");
CPPUNIT_ASSERT_EQUAL((unsigned int)3, tag.itemListMap().size());
}
void testTextBinary()