commit 6f3dc2f34ed8043d30937f436979ef360dcf3774
author Nick Kralevich <nnk@google.com> Fri Aug 07 16:53:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 07 16:53:53 2015 +0000
tree 7f5c9ea6c0463b2580f380b9e6d298837d3a62bd
parent 0625841daae5bb1351034909ce705aab517eea2d
parent c253c1fdfebf6c9f6f7ee8ebbf6e0759c431e947

am c253c1fd: am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX

* commit 'c253c1fdfebf6c9f6f7ee8ebbf6e0759c431e947':
  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 e81f048..c8a5dbe 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2220,7 +2220,7 @@
 }
 
 status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) {
-    if (size < 4) {
+    if (size < 4 || size == SIZE_MAX) {
         return ERROR_MALFORMED;
     }