commit 4f16d200709123a32b16b0e64ce821d6c0893fff
author Christian Bejram <cbejram@google.com> Tue Oct 20 00:34:05 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 20 00:34:05 2015 +0000
tree d571e81d4cf5ba7714bc686d789f2eeb0a3914cd
parent 81fe612e61475bb395e167c72b785912da0230bf
parent 9ddf1c76121caef55a05c537d6a9a1d76c1d17be

Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-dev

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