Commit 62d89908 authored Oct 06, 2015 by Wei Jia Committed by Android Git Automerger Oct 06, 2015

am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer...

am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit 'df68d9d5':
  MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.

parents 7ce82583 df68d9d5

media/libstagefright/MPEG4Extractor.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -2347,6 +2347,12 @@ status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) {
		mLastCommentName.setTo((const char *)buffer + 4);
		break;
		case FOURCC('d', 'a', 't', 'a'):
		if (size < 8) {
		delete[] buffer;
		buffer = NULL;
		ALOGE("b/24346430");
		return ERROR_MALFORMED;
		}
		mLastCommentData.setTo((const char *)buffer + 8);
		break;
		}