diff options
| author | Neel Mehta <nmehta@google.com> | 2015-08-18 16:33:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 16:33:48 +0000 |
| commit | e9a8362e1d379e90655e904ca49d6333e4218eda (patch) | |
| tree | 06045d952b339d8891f04c94a25a9ff701aa83ce /media/libstagefright/id3/ID3.cpp | |
| parent | 6afd8574d44ae158bed9cafe1c74dd1bfc5573b6 (diff) | |
| parent | a2a6826494dec4a8fab6bd6828828fae886e516a (diff) | |
| download | frameworks_av-e9a8362e1d379e90655e904ca49d6333e4218eda.zip frameworks_av-e9a8362e1d379e90655e904ca49d6333e4218eda.tar.gz frameworks_av-e9a8362e1d379e90655e904ca49d6333e4218eda.tar.bz2 | |
am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
* commit 'a2a6826494dec4a8fab6bd6828828fae886e516a':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
Diffstat (limited to 'media/libstagefright/id3/ID3.cpp')
| -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 a39aecf..fb3ae49 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); |