diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-07 16:48:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 16:48:51 +0000 |
| commit | c253c1fdfebf6c9f6f7ee8ebbf6e0759c431e947 (patch) | |
| tree | 7f5c9ea6c0463b2580f380b9e6d298837d3a62bd /media | |
| parent | dfaea255546340742b42c216663f61c6b7301c4f (diff) | |
| parent | b449e46904854eccea79a40e16b2ba5132611bf3 (diff) | |
| download | frameworks_av-c253c1fdfebf6c9f6f7ee8ebbf6e0759c431e947.zip frameworks_av-c253c1fdfebf6c9f6f7ee8ebbf6e0759c431e947.tar.gz frameworks_av-c253c1fdfebf6c9f6f7ee8ebbf6e0759c431e947.tar.bz2 | |
am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX
* commit 'b449e46904854eccea79a40e16b2ba5132611bf3':
MPEG4Extractor.cpp: Add check for 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 e81f048..c8a5dbe 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2220,7 +2220,7 @@ status_t MPEG4Extractor::parseTrackHeader( } status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) { - if (size < 4) { + if (size < 4 || size == SIZE_MAX) { return ERROR_MALFORMED; } |