diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-07 17:55:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 17:55:31 +0000 |
| commit | 1a053a0ae002cdda31c39d4c7447b1f7e65dfec6 (patch) | |
| tree | 9b47bd6658919c702de5aa1afb6191b337474693 /media/libstagefright | |
| parent | 48192b84db39879e7d83a2f4e7023048fb81ee8e (diff) | |
| parent | 6f3dc2f34ed8043d30937f436979ef360dcf3774 (diff) | |
| download | frameworks_av-1a053a0ae002cdda31c39d4c7447b1f7e65dfec6.zip frameworks_av-1a053a0ae002cdda31c39d4c7447b1f7e65dfec6.tar.gz frameworks_av-1a053a0ae002cdda31c39d4c7447b1f7e65dfec6.tar.bz2 | |
am 6f3dc2f3: am c253c1fd: am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX
* commit '6f3dc2f34ed8043d30937f436979ef360dcf3774':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Diffstat (limited to 'media/libstagefright')
| -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 71d19c0..33ff39d 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2225,7 +2225,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; } |