diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-10 21:24:54 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-08-10 21:24:54 -0700 |
| commit | 94f8150be2041f73c2f185f2c3622a9537d47454 (patch) | |
| tree | 7999571769c7a72999b2889fdf5054fa8667aaab /media/libstagefright/MPEG4Extractor.cpp | |
| parent | ba34c2ba414352ed0c1b9188f51c5445b04af2c6 (diff) | |
| parent | c86eae32ebb0cc580a13dde30fe765a96b8e701c (diff) | |
| download | frameworks_av-94f8150be2041f73c2f185f2c3622a9537d47454.zip frameworks_av-94f8150be2041f73c2f185f2c3622a9537d47454.tar.gz frameworks_av-94f8150be2041f73c2f185f2c3622a9537d47454.tar.bz2 | |
resolved conflicts for merge of c86eae32 to klp-modular-dev
Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f
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 9e6396c..1c1b31a 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2062,7 +2062,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; } |