diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-06-05 16:32:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-05 16:32:40 +0000 |
| commit | f0e1fb59f3ea24ce4f7f10d156bf8470a7236445 (patch) | |
| tree | 6e974c357e800dcd2868b9c4cbed8f7a1a00d836 /media | |
| parent | 9d038ba466df9179f1ec0d2b58dcabf19761bf24 (diff) | |
| parent | 4a492bf2ac47b9844d2527e1fcdf0064c3d8d52e (diff) | |
| download | frameworks_av-f0e1fb59f3ea24ce4f7f10d156bf8470a7236445.zip frameworks_av-f0e1fb59f3ea24ce4f7f10d156bf8470a7236445.tar.gz frameworks_av-f0e1fb59f3ea24ce4f7f10d156bf8470a7236445.tar.bz2 | |
am 4a492bf2: Fix integer underflow in covr MPEG4 processing
* commit '4a492bf2ac47b9844d2527e1fcdf0064c3d8d52e':
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 bf5b980..5375caa 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1762,6 +1762,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); |