commit 186d1fb9b72439c1c3317d72e4a0f52f466e6861
author Nick Kralevich <nnk@google.com> Tue Aug 11 02:32:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 11 02:32:49 2015 +0000
tree 7197300b2129cfc3e7252d89d4347f24429cb659
parent d9d35098aaaa546d79d0707734aac9b4b12c5be1
parent f4dfe12ecd26e7d6965a2abc062709b6d7d942c4

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

* commit 'f4dfe12ecd26e7d6965a2abc062709b6d7d942c4':
  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;
     }