diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-11 03:31:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 03:31:38 +0000 |
| commit | c86eae32ebb0cc580a13dde30fe765a96b8e701c (patch) | |
| tree | 4eb8a59bcab02baaaa47b5b057f2e21d41313df4 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | f59348edfc54baa8f6e6532c6484656cf444d199 (diff) | |
| parent | 9d9491f9fb83523cfe68f2aa26c14f72f70812fc (diff) | |
| download | frameworks_av-c86eae32ebb0cc580a13dde30fe765a96b8e701c.zip frameworks_av-c86eae32ebb0cc580a13dde30fe765a96b8e701c.tar.gz frameworks_av-c86eae32ebb0cc580a13dde30fe765a96b8e701c.tar.bz2 | |
am 9d9491f9: am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '9d9491f9fb83523cfe68f2aa26c14f72f70812fc':
MPEG4Extractor.cpp: Add check for 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 4b6174a..56bd875 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2029,7 +2029,7 @@ status_t MPEG4Extractor::parseTrackHeader( } status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) { - if (size < 4) { + if (size < 4 || size == SIZE_MAX) { return ERROR_MALFORMED; } |