commit f0b53a1c06ca19656373ab48b76b71946c096a5a
author Lajos Molnar <lajos@google.com> Mon Oct 12 17:10:31 2015 -0700
committer The Android Automerger <android-build@android.com> Tue Oct 27 11:30:14 2015 -0700
tree 2a5ddf6d7e89b85e83b544cb9090ea934f1a9171
parent cf6067b5f192f8ede803e9671a9afa4527dbd35c

stagefright: check bounds for MediaCodecList.getCodecInfo

Bug: 24445127
Change-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec

include/media/stagefright/MediaCodecList.h

diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h
index c2bbe4d..ac7b053 100644
--- a/include/media/stagefright/MediaCodecList.h
+++ b/include/media/stagefright/MediaCodecList.h
@@ -45,6 +45,10 @@
     virtual size_t countCodecs() const;
 
     virtual sp<MediaCodecInfo> getCodecInfo(size_t index) const {
+        if (index >= mCodecInfos.size()) {
+            ALOGE("b/24445127");
+            return NULL;
+        }
         return mCodecInfos.itemAt(index);
     }