diff options
| author | Wei Jia <wjia@google.com> | 2015-10-06 21:36:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-06 21:36:36 +0000 |
| commit | 39d91e7bc5c62cf7349cf34ba91ae45f9eb12283 (patch) | |
| tree | 9d08a7f112c08117557a7dbc190deff26116d3d3 /media | |
| parent | 6f14568be83995a0ee0104f521f93e1e4d9902f3 (diff) | |
| parent | b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca (diff) | |
| download | frameworks_av-39d91e7bc5c62cf7349cf34ba91ae45f9eb12283.zip frameworks_av-39d91e7bc5c62cf7349cf34ba91ae45f9eb12283.tar.gz frameworks_av-39d91e7bc5c62cf7349cf34ba91ae45f9eb12283.tar.bz2 | |
Merge "ID3: check possible integer overflow for extendedHeaderSize and paddingSize." into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/id3/ID3.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index 00f87aa..4410579 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp @@ -194,6 +194,13 @@ struct id3_header { if (header.version_major == 4) { void *copy = malloc(size); + if (copy == NULL) { + free(mData); + mData = NULL; + ALOGE("b/24623447, no more memory"); + return false; + } + memcpy(copy, mData, size); bool success = removeUnsynchronizationV2_4(false /* iTunesHack */); @@ -234,7 +241,14 @@ struct id3_header { return false; } - size_t extendedHeaderSize = U32_AT(&mData[0]) + 4; + size_t extendedHeaderSize = U32_AT(&mData[0]); + if (extendedHeaderSize > SIZE_MAX - 4) { + free(mData); + mData = NULL; + ALOGE("b/24623447, extendedHeaderSize is too large"); + return false; + } + extendedHeaderSize += 4; if (extendedHeaderSize > mSize) { free(mData); @@ -252,7 +266,10 @@ struct id3_header { if (extendedHeaderSize >= 10) { size_t paddingSize = U32_AT(&mData[6]); - if (mFirstFrameOffset + paddingSize > mSize) { + if (paddingSize > SIZE_MAX - mFirstFrameOffset) { + ALOGE("b/24623447, paddingSize is too large"); + } + if (paddingSize > mSize - mFirstFrameOffset) { free(mData); mData = NULL; |