commit af0441dd9871c4c6a066076bff2f0100cc98ae6b
author Lajos Molnar <lajos@google.com> Mon Oct 19 23:45:17 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 19 23:45:17 2015 +0000
tree c2f7d725ab7721e66ec7ad2214dd0dc396a7ff5e
parent 74ee3ba4177c705e08b9af3bb94551f7f87dc5b3
parent 22effff54af6ff60c5cf6ec66872478bcde7302b

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

* commit '22effff54af6ff60c5cf6ec66872478bcde7302b':
  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);
     }