Commit 32ba6ec7 authored Oct 19, 2015 by Lajos Molnar Committed by Android Git Automerger Oct 19, 2015

am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge...

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

* commit '0378676b':
  stagefright: check bounds for MediaCodecList.getCodecInfo

parents 7b806481 0378676b

include/media/stagefright/MediaCodecList.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,10 @@ struct MediaCodecList : public BnMediaCodecList {
		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);
		}