commit b449e46904854eccea79a40e16b2ba5132611bf3
author Nick Kralevich <nnk@google.com> Fri Aug 07 16:39:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 07 16:39:18 2015 +0000
tree d36d04836ff5f7f2611b95a37fa0b2e8ef06f245
parent 578d5b66fc9f5e36ca0cb19b21771aa85ec131ee
parent c570778430a22b5488cae72982cf9fb8033dbda3

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

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