diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-07 16:39:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 16:39:18 +0000 |
| commit | b449e46904854eccea79a40e16b2ba5132611bf3 (patch) | |
| tree | d36d04836ff5f7f2611b95a37fa0b2e8ef06f245 /media | |
| parent | 578d5b66fc9f5e36ca0cb19b21771aa85ec131ee (diff) | |
| parent | c570778430a22b5488cae72982cf9fb8033dbda3 (diff) | |
| download | frameworks_av-b449e46904854eccea79a40e16b2ba5132611bf3.zip frameworks_av-b449e46904854eccea79a40e16b2ba5132611bf3.tar.gz frameworks_av-b449e46904854eccea79a40e16b2ba5132611bf3.tar.bz2 | |
am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX
* commit 'c570778430a22b5488cae72982cf9fb8033dbda3':
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 d1b39dc..411946c 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2217,7 +2217,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; } |