diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-08 15:19:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 15:19:26 +0000 |
| commit | d9d35098aaaa546d79d0707734aac9b4b12c5be1 (patch) | |
| tree | ca971b28d76148f7debc88bc6429fdf8faf8431a /media | |
| parent | 0e33cb2dd5ccf6f4db8c694cb2c233bb1d2a2d0b (diff) | |
| parent | af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9 (diff) | |
| download | frameworks_av-d9d35098aaaa546d79d0707734aac9b4b12c5be1.zip frameworks_av-d9d35098aaaa546d79d0707734aac9b4b12c5be1.tar.gz frameworks_av-d9d35098aaaa546d79d0707734aac9b4b12c5be1.tar.bz2 | |
am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit 'af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Diffstat (limited to 'media')
| -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 ae324d9..c075906 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1398,7 +1398,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; } |