commit 2fe61ed032e083dc39265f3b88274fcb8fbeed9b
author Nick Kralevich <nnk@google.com> Tue Aug 11 02:49:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 11 02:49:10 2015 +0000
tree 8b598706e5a5dcd9b1444f99dcaf01440bc1a869
parent fea5921b975cf43c88b8f93d4f2500abde6088be
parent 3b8d3fa0dd97c05f77c4686986812e40203678d2

am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '3b8d3fa0dd97c05f77c4686986812e40203678d2':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index c075906..09a963d 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1567,7 +1567,7 @@
 }
 
 status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) {
-    if (size < 4) {
+    if (size < 4 || size == SIZE_MAX) {
         return ERROR_MALFORMED;
     }