diff options
author | Joshua J. Drake <android-open-source@qoop.org> | 2015-06-05 16:57:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-05 16:57:16 +0000 |
commit | 0773dc374056f46ff2d98f6421e12365968ba423 (patch) | |
tree | 5974909511451d4e19f6550859937ea1f46514a7 | |
parent | e0095a19666afbab36dd0e8e4544e7f4ec9f890c (diff) | |
parent | 768a8fb4c05f524c802f8e97c9e07b73d1a196ff (diff) | |
download | frameworks_av-0773dc374056f46ff2d98f6421e12365968ba423.zip frameworks_av-0773dc374056f46ff2d98f6421e12365968ba423.tar.gz frameworks_av-0773dc374056f46ff2d98f6421e12365968ba423.tar.bz2 |
am 768a8fb4: am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing
* commit '768a8fb4c05f524c802f8e97c9e07b73d1a196ff':
Fix integer underflow in covr MPEG4 processing
-rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 053bfbf..5a86aac 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1931,6 +1931,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { return ERROR_IO; } const int kSkipBytesOfDataBox = 16; + if (chunk_data_size <= kSkipBytesOfDataBox) { + return ERROR_MALFORMED; + } + mFileMetaData->setData( kKeyAlbumArt, MetaData::TYPE_NONE, buffer->data() + kSkipBytesOfDataBox, chunk_data_size - kSkipBytesOfDataBox); |