Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873... (af69fd92) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -3125,6 +3125,13 @@ status_t MPEG4Extractor::parse3GPPMetaData(off64_t offset, size_t size, int dept
		}
		case FOURCC('y', 'r', 'r', 'c'):
		{
		if (size < 6) {
		delete[] buffer;
		buffer = NULL;
		ALOGE("b/62133227");
		android_errorWriteLog(0x534e4554, "62133227");
		return ERROR_MALFORMED;
		}
		char tmp[5];
		uint16_t year = U16_AT(&buffer[4]);

		@@ -3147,6 +3154,8 @@ status_t MPEG4Extractor::parse3GPPMetaData(off64_t offset, size_t size, int dept

		// smallest possible valid UTF-16 string w BOM: 0xfe 0xff 0x00 0x00
		if (size < 6) {
		delete[] buffer;
		buffer = NULL;
		return ERROR_MALFORMED;
		}