diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-08 17:33:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 17:33:12 +0000 |
| commit | 5aa85d05aaeb5509597b7876942b6f5e543a451c (patch) | |
| tree | 1a9c16f4f781850b3542ceeb354afad7ae649967 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | f647c38a3e4b065fc26d0a8bb55071dae1028ac2 (diff) | |
| parent | 74cda34ac909eb713cec22bebb08ecaeefd8f7dd (diff) | |
| download | frameworks_av-5aa85d05aaeb5509597b7876942b6f5e543a451c.zip frameworks_av-5aa85d05aaeb5509597b7876942b6f5e543a451c.tar.gz frameworks_av-5aa85d05aaeb5509597b7876942b6f5e543a451c.tar.bz2 | |
am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '74cda34ac909eb713cec22bebb08ecaeefd8f7dd':
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 0806c6c..98f1517 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1909,7 +1909,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; } |