commit fc8c226b75a45876e6545c3a217698ada52bd2d6
author Wei Jia <wjia@google.com> Sun Aug 16 18:19:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Aug 16 18:19:37 2015 +0000
tree b448fbcfa6446be1a0097ce992c5bb61dfebc2e7
parent 74d3170ffc02620fcedb5a98c7a66e83ee2faa87
parent 98e68e84f173aba6967770629d3ea7991a1dfb91

Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 56bd875..9f257f7 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1772,7 +1772,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);