diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-11 02:26:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 02:26:38 +0000 |
| commit | f4dfe12ecd26e7d6965a2abc062709b6d7d942c4 (patch) | |
| tree | 7c015593efd599b76760fa685b3ef564306f6af0 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9 (diff) | |
| parent | 54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0 (diff) | |
| download | frameworks_av-f4dfe12ecd26e7d6965a2abc062709b6d7d942c4.zip frameworks_av-f4dfe12ecd26e7d6965a2abc062709b6d7d942c4.tar.gz frameworks_av-f4dfe12ecd26e7d6965a2abc062709b6d7d942c4.tar.bz2 | |
am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0':
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 c075906..09a963d 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1567,7 +1567,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; } |