diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-04 16:49:28 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-08-04 23:52:34 +0000 |
| commit | f26400c9d01a0e2f71690d5ebc644270f098d590 (patch) | |
| tree | b96386b9c3bf83c969ed207dbd7b53eb29e6c6a3 /media/libstagefright/id3/ID3.cpp | |
| parent | d9a9a324766b26be2ff0d10537ea0b215b0261e3 (diff) | |
| download | frameworks_av-f26400c9d01a0e2f71690d5ebc644270f098d590.zip frameworks_av-f26400c9d01a0e2f71690d5ebc644270f098d590.tar.gz frameworks_av-f26400c9d01a0e2f71690d5ebc644270f098d590.tar.bz2 | |
Fix crash on malformed id3
Bug: 22954006
Change-Id: I488cb1e2c69fc7043b6040481b30fa866000515d
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 34d671a..7f478f7 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]; |