diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-07 14:25:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 14:25:10 +0000 |
| commit | d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3 (patch) | |
| tree | b62ef0d8d86dd5a159fda3997b7b7369ced8a96c /media/libstagefright/id3/ID3.cpp | |
| parent | 42bd61d73e8b4d0b1101e73324a59fde51077112 (diff) | |
| parent | f26400c9d01a0e2f71690d5ebc644270f098d590 (diff) | |
| download | frameworks_av-d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3.zip frameworks_av-d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3.tar.gz frameworks_av-d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3.tar.bz2 | |
am f26400c9: Fix crash on malformed id3
* commit 'f26400c9d01a0e2f71690d5ebc644270f098d590':
Fix crash on malformed id3
Diffstat (limited to 'media/libstagefright/id3/ID3.cpp')
| -rw-r--r-- | media/libstagefright/id3/ID3.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index 1ec4a40..461bf6e 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp @@ -825,6 +825,12 @@ ID3::getAlbumArt(size_t *length, String8 *mime) const { size_t descLen = StringSize(&data[2 + mimeLen], encoding); + if (size < 2 || + size - 2 < mimeLen || + size - 2 - mimeLen < descLen) { + ALOGW("bogus album art sizes"); + return NULL; + } *length = size - 2 - mimeLen - descLen; return &data[2 + mimeLen + descLen]; |