Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo

Browse Source
This commit is contained in:
Andreas Huber
2010-03-29 15:16:20 -07:00
committed by Android (Google) Code Review
parent c6dc5070ef c2eeb2f52e
commit 02a1f78987
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/id3/ID3.cpp
View File

@@ -28,6 +28,8 @@
namespace android { namespace android {
static const size_t kMaxMetadataSize = 3 * 1024 * 1024;
ID3::ID3(const sp<DataSource> &source) ID3::ID3(const sp<DataSource> &source)
: mIsValid(false), : mIsValid(false),
mData(NULL), mData(NULL),
@@ -111,6 +113,11 @@ bool ID3::parseV2(const sp<DataSource> &source) {
size = (size << 7) | header.enc_size[i]; size = (size << 7) | header.enc_size[i];
} }
if (size > kMaxMetadataSize) {
LOGE("skipping huge ID3 metadata of size %d", size);
return false;
}
mData = (uint8_t *)malloc(size); mData = (uint8_t *)malloc(size);
if (mData == NULL) { if (mData == NULL) {