commit 1f50604822f432965d302fe6af7adca6998d8004
author Lajos Molnar <lajos@google.com> Mon Oct 19 19:55:25 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 19 19:55:25 2015 +0000
tree 1af7590015198858d5a2ba0e30477307e7f9713b
parent a04159acc4c49f13fbfa5b5bee5e5b622eb2d659
parent 00a1dcafd944ff93eb4848f044adcbfb0784a0dd

am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev
am: 00a1dcafd9

* commit '00a1dcafd944ff93eb4848f044adcbfb0784a0dd':
  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 3aaa032..bf4db87 100644
--- a/include/media/stagefright/MediaCodecList.h
+++ b/include/media/stagefright/MediaCodecList.h
@@ -47,6 +47,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);
     }