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

am e550d213: am f70b69a8: Merge "stagefright: check bounds for...

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

* commit 'e550d213':
  stagefright: check bounds for MediaCodecList.getCodecInfo

parents f5bff8c9 e550d213

include/media/stagefright/MediaCodecList.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,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);
		}