diff options
| author | Neel Mehta <nmehta@google.com> | 2015-08-20 01:30:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 01:30:15 +0000 |
| commit | a4ebdaadd831b457b57ee4402bb5014fae04abe2 (patch) | |
| tree | 1aed0b1e0d3036eb117d1db7a6c359459c2a59d5 /media/libstagefright/id3 | |
| parent | 3c376c6fac2497640e68c75fd4a0e1fa0d79c3b0 (diff) | |
| parent | 0cc0d158694b20f210ba4ad41fe4adc5bda57402 (diff) | |
| download | frameworks_av-a4ebdaadd831b457b57ee4402bb5014fae04abe2.zip frameworks_av-a4ebdaadd831b457b57ee4402bb5014fae04abe2.tar.gz frameworks_av-a4ebdaadd831b457b57ee4402bb5014fae04abe2.tar.bz2 | |
am 0cc0d158: am 06682f94: am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
* commit '0cc0d158694b20f210ba4ad41fe4adc5bda57402':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
Diffstat (limited to 'media/libstagefright/id3')
| -rw-r--r-- | media/libstagefright/id3/ID3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index 29bc9e0..165d4d9 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp @@ -349,7 +349,7 @@ bool ID3::removeUnsynchronizationV2_4(bool iTunesHack) { if (flags & 1) { // Strip data length indicator - if (mSize < 14 || mSize - 14 < offset) { + if (mSize < 14 || mSize - 14 < offset || dataSize < 4) { return false; } memmove(&mData[offset + 10], &mData[offset + 14], mSize - offset - 14); |