diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-11 02:57:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 02:57:48 +0000 |
| commit | c99244105803ac32f4cc698b5b2a85b225d925a2 (patch) | |
| tree | cd0420fd98299cd64376820596f1c5dca9b0b343 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9 (diff) | |
| parent | 2fe61ed032e083dc39265f3b88274fcb8fbeed9b (diff) | |
| download | frameworks_av-c99244105803ac32f4cc698b5b2a85b225d925a2.zip frameworks_av-c99244105803ac32f4cc698b5b2a85b225d925a2.tar.gz frameworks_av-c99244105803ac32f4cc698b5b2a85b225d925a2.tar.bz2 | |
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 '2fe61ed032e083dc39265f3b88274fcb8fbeed9b':
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 af22e8e..1f86575 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1562,7 +1562,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; } |