diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-06-10 22:59:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-10 22:59:02 +0000 |
| commit | 30b72fcf1fbb4191fb5986eade487becc39cfcd1 (patch) | |
| tree | ae9db3e25f62f4ebff541db2a5efd35ed14f49ae | |
| parent | c98f2a0aa96c07aae6218e9e804ab18e9b50de3e (diff) | |
| parent | 0773dc374056f46ff2d98f6421e12365968ba423 (diff) | |
| download | frameworks_av-30b72fcf1fbb4191fb5986eade487becc39cfcd1.zip frameworks_av-30b72fcf1fbb4191fb5986eade487becc39cfcd1.tar.gz frameworks_av-30b72fcf1fbb4191fb5986eade487becc39cfcd1.tar.bz2 | |
am 0773dc37: am 768a8fb4: am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing
* commit '0773dc374056f46ff2d98f6421e12365968ba423':
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 a1521de..613f0bc 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1934,6 +1934,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); |