diff options
| author | Wei Jia <wjia@google.com> | 2015-10-06 22:17:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-06 22:17:52 +0000 |
| commit | fc0e2a87c17b1f326b5e3302e8f534c143fd5784 (patch) | |
| tree | 96ade437d2b8f49421a4d4d33dbb62f397a7d9ff /media/libstagefright | |
| parent | 00f5fa82d884c0ca41ee08e7a67ab54238109083 (diff) | |
| parent | 7ed8d1eff9b292b3c65a875b13a549e29654534b (diff) | |
| download | frameworks_av-fc0e2a87c17b1f326b5e3302e8f534c143fd5784.zip frameworks_av-fc0e2a87c17b1f326b5e3302e8f534c143fd5784.tar.gz frameworks_av-fc0e2a87c17b1f326b5e3302e8f534c143fd5784.tar.bz2 | |
am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
* commit '7ed8d1eff9b292b3c65a875b13a549e29654534b':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
Diffstat (limited to 'media/libstagefright')
| -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 f2a8a73..b25fc4d 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; |