commit 652926c8a37fb904aaa0756a0d0bae0574f308c5
author Wei Jia <wjia@google.com> Tue Aug 18 00:53:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 00:53:08 2015 +0000
tree 1323b1bde9c58a244c06669cfdb91d3dcc6f31c0
parent b46eb8d9f8bff2e6ddec1902acc9d2ad65147d68
parent 74d3170ffc02620fcedb5a98c7a66e83ee2faa87

am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev

* commit '74d3170ffc02620fcedb5a98c7a66e83ee2faa87':
  Fix comparison sign warnings.

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 1c1b31a..607eff6 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1776,7 +1776,7 @@
                 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);