commit 0378676b3f12158537a01916e69f6ab51817605f
author Lajos Molnar <lajos@google.com> Mon Oct 19 19:37:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 19 19:37:04 2015 +0000
tree 50acfa79aca6076b56c66e1f6d0d26b530038242
parent f30d7e0acc573b58333c3c704c2a46eda1dbfcff
parent 92990810407a2e1101f5db156c1e264887886c82

am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev

* commit '92990810407a2e1101f5db156c1e264887886c82':
  stagefright: check bounds for MediaCodecList.getCodecInfo

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);
     }