diff options
| author | Wei Jia <wjia@google.com> | 2015-08-18 01:45:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 01:45:49 +0000 |
| commit | 46f7acbb3d323a3f67ba1f91494b7466676b7122 (patch) | |
| tree | 42717030112c90492edab0416a7aef9fbc4bfdd2 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | ab33de61ccf1d0fab39573a79cf8372045bbda1a (diff) | |
| parent | 3175ff3f343ecd85700e2029d7709ce960272967 (diff) | |
| download | frameworks_av-46f7acbb3d323a3f67ba1f91494b7466676b7122.zip frameworks_av-46f7acbb3d323a3f67ba1f91494b7466676b7122.tar.gz frameworks_av-46f7acbb3d323a3f67ba1f91494b7466676b7122.tar.bz2 | |
am 3175ff3f: am 90eee339: am 652926c8: am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev
* commit '3175ff3f343ecd85700e2029d7709ce960272967':
Fix comparison sign warnings.
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 056ead1..f8d0d9b 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1945,7 +1945,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { ALOGV("chunk_data_size = %lld and data_offset = %lld", chunk_data_size, data_offset); - if (chunk_data_size >= SIZE_MAX - 1) { + if (chunk_data_size < 0 || static_cast<uint64_t>(chunk_data_size) >= SIZE_MAX - 1) { return ERROR_MALFORMED; } sp<ABuffer> buffer = new ABuffer(chunk_data_size + 1); |