commit 49094be13c200bf91ef4336a3b47526a8a32139a
author Dan Albert <danalbert@google.com> Fri May 08 10:43:54 2015 -0700
committer The Android Automerger <android-build@android.com> Wed Sep 02 18:15:03 2015 -0700
tree 984ff442ad1cf77d90efe55e6e2d7b93c5ad6341
parent 69a205a5fccc0d92d23c483de3fd8029c2436bd4

Fix comparison sign warnings.

Bug:23213430

Change-Id: I6f2e2b03b968a569b122004b4803c5d17fccfb12
(cherry picked from commit 635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c)

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index f68c89f..c745198 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1945,7 +1945,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);