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

Do bounds checking before assuming that just because we've been told that

Browse Source 
there are actually more items that there actually are.

BUG:92028


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@359382 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Scott Wheeler 2004-10-31 20:30:47 +00:00
parent df700f96f6
commit a3e62fb32e
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ape/ape-tag-format.txt
View File

@ -87,7 +87,7 @@ Member of APE Tag 2.0
| | | items excluding the header (for 1.000 |
| | | compatibility) |
|----------------|---------|------------------------------------------------|
|Item Count | 4 bytes | Number of items in the tag |
| Item Count | 4 bytes | Number of items in the tag |
|----------------|---------|------------------------------------------------|
| Tag Flags | 4 bytes | Global flags |
|----------------|---------|------------------------------------------------|
@ -167,4 +167,4 @@ bitrate demands to avoid unnecessary drop-outs.
Sections 5 - 7 haven't yet been converted from:
http://www.personal.uni-jena.de/~pfk/mpp/sv8/apetag.html
http://www.personal.uni-jena.de/~pfk/mpp/sv8/apetag.html

4
ape/apeitem.cpp
View File

@ -126,7 +126,9 @@ bool APE::Item::isEmpty() const
void APE::Item::parse(const ByteVector &data)
{
if(data.size() < 10) {
// 11 bytes is the minimum size for an APE item
if(data.size() < 11) {
debug("APE::Item::parse() -- no data in item");
return;
}

14
ape/apetag.cpp
View File

@ -213,7 +213,7 @@ void APE::Tag::read()
return;
d->file->seek(d->tagOffset + Footer::size() - d->footer.tagSize());
parse(d->file->readBlock(d->footer.tagSize() - Footer::size()), d->footer.itemCount());
parse(d->file->readBlock(d->footer.tagSize() - Footer::size()));
}
}
@ -238,17 +238,23 @@ ByteVector APE::Tag::render() const
return d->footer.renderHeader() + data + d->footer.renderFooter();
}
void APE::Tag::parse(const ByteVector &data, uint count)
void APE::Tag::parse(const ByteVector &data, uint)
{
parse(data);
}
void APE::Tag::parse(const ByteVector &data)
{
uint pos = 0;
while(count > 0) {
// 11 bytes is the minimum size for an APE item
for(uint i = 0; i < d->footer.itemCount() && pos <= data.size() - 11; i++) {
APE::Item item;
item.parse(data.mid(pos));
d->itemListMap.insert(item.key().upper(), item);
pos += item.size();
count--;
}
}

6
ape/apetag.h
View File

@ -142,9 +142,15 @@ namespace TagLib {
void read();
/*!
* Parses the body of the tag in \a data with \a count items.
* \deprecated Please use the version that doesn't require an item count.
*/
void parse(const ByteVector &data, uint count);
/*!
* Parses the body of the tag in \a data.
*/
void parse(const ByteVector &data);
private:
Tag(const Tag &);
Tag &operator=(const Tag &);