diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-08 16:23:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 16:23:51 +0000 |
| commit | 3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2 (patch) | |
| tree | 2dcb27e1b672253e74fcad62541c8c1f5920297a /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 905aae465fa88d6d793c670c08c360900c6cb3f7 (diff) | |
| parent | 2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9 (diff) | |
| download | frameworks_av-3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2.zip frameworks_av-3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2.tar.gz frameworks_av-3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2.tar.bz2 | |
am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 08f1e89..b1b3c21 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1638,7 +1638,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { size = 0; } - if (SIZE_MAX - chunk_size <= size) { + if ((chunk_size > SIZE_MAX) || (SIZE_MAX - chunk_size <= size)) { return ERROR_MALFORMED; } |