diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-07 18:02:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 18:02:34 +0000 |
| commit | 2ca9865ea0c8124c6cbb48c023aec267d3e78978 (patch) | |
| tree | b9f2321a4c7b5d2b2f91322cfe322c9f3d622f53 /media | |
| parent | e0e37e13bc9e62e58484d1e54e66eaf506744548 (diff) | |
| parent | 1a053a0ae002cdda31c39d4c7447b1f7e65dfec6 (diff) | |
| download | frameworks_av-2ca9865ea0c8124c6cbb48c023aec267d3e78978.zip frameworks_av-2ca9865ea0c8124c6cbb48c023aec267d3e78978.tar.gz frameworks_av-2ca9865ea0c8124c6cbb48c023aec267d3e78978.tar.bz2 | |
am 1a053a0a: am 6f3dc2f3: am c253c1fd: am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX
* commit '1a053a0ae002cdda31c39d4c7447b1f7e65dfec6':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Diffstat (limited to 'media')
| -rwxr-xr-x | 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 025f220..53d1a62 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2447,7 +2447,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; } |