commit 8026ad3838e2f7367e8ff616f66b2c2f8bc8488c
author Abhishek Arya <aarya@google.com> Tue Aug 18 13:41:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 13:41:18 2015 +0000
tree 3747eda3e981b49ee24623909c9b4ceba0c2e656
parent d146d4660451fb04c039f4ac8554103876fa4722
parent 6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd

am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd':
  Check vector size before accessing

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 607eff6..8243cf5 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2944,8 +2944,17 @@
     int ivlength;
     CHECK(mFormat->findInt32(kKeyCryptoDefaultIVSize, &ivlength));
 
+    // only 0, 8 and 16 byte initialization vectors are supported
+    if (ivlength != 0 && ivlength != 8 && ivlength != 16) {
+        ALOGW("unsupported IV length: %d", ivlength);
+        return ERROR_MALFORMED;
+    }
     // read CencSampleAuxiliaryDataFormats
     for (size_t i = 0; i < mCurrentSampleInfoCount; i++) {
+        if (i >= mCurrentSamples.size()) {
+            ALOGW("too few samples");
+            break;
+        }
         Sample *smpl = &mCurrentSamples.editItemAt(i);
 
         memset(smpl->iv, 0, 16);