diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-08-04 21:18:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 21:18:33 +0000 |
| commit | 3329a19b4d11d3c1310bbe9aa54b6a66488ab862 (patch) | |
| tree | 0aff0a9a9974143a40d14c6cbc2584b8502b7191 /media | |
| parent | a5b9055d7ce1d82ee29ed2f45aa4f8a82ccc76f2 (diff) | |
| parent | c87faed60483afb2466e03892bda80b72e5822c7 (diff) | |
| download | frameworks_av-3329a19b4d11d3c1310bbe9aa54b6a66488ab862.zip frameworks_av-3329a19b4d11d3c1310bbe9aa54b6a66488ab862.tar.gz frameworks_av-3329a19b4d11d3c1310bbe9aa54b6a66488ab862.tar.bz2 | |
am c87faed6: Fix integer underflow in covr MPEG4 processing
* commit 'c87faed60483afb2466e03892bda80b72e5822c7':
Fix integer underflow in covr MPEG4 processing
Diffstat (limited to 'media')
| -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 e0954cc..9c5859f 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1444,6 +1444,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 + kSkipBytesOfDataBox, chunk_data_size - kSkipBytesOfDataBox); |