diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-06-05 16:43:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-05 16:43:45 +0000 |
| commit | 768a8fb4c05f524c802f8e97c9e07b73d1a196ff (patch) | |
| tree | 99bd128089a90842ff7ba84e62631e9f194fa064 | |
| parent | 86174e2c09986b2d2ebcaf95a4a3e614bcf134ef (diff) | |
| parent | f0e1fb59f3ea24ce4f7f10d156bf8470a7236445 (diff) | |
| download | frameworks_av-768a8fb4c05f524c802f8e97c9e07b73d1a196ff.zip frameworks_av-768a8fb4c05f524c802f8e97c9e07b73d1a196ff.tar.gz frameworks_av-768a8fb4c05f524c802f8e97c9e07b73d1a196ff.tar.bz2 | |
am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing
* commit 'f0e1fb59f3ea24ce4f7f10d156bf8470a7236445':
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); |