Merge "Crash by invalid ac4 field of mp4 file in fuzzy test" into rvc-dev am:... (72d93207) · Commits · e / os / android_frameworks_av

media/extractors/mp4/AC4Parser.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -600,6 +600,10 @@ bool AC4DSIParser::parse() {
		if (ac4_dsi_version == 1) {
		uint64_t end = (mDSISize - mBitReader.numBitsLeft()) / 8;
		uint64_t presentation_bytes = end - start;
		if (pres_bytes < presentation_bytes) {
		ALOGE("pres_bytes is smaller than presentation_bytes.");
		return false;
		}
		uint64_t skip_bytes = pres_bytes - presentation_bytes;
		ALOGV("skipping = %" PRIu64 " bytes", skip_bytes);
		CHECK_BITS_LEFT(skip_bytes * 8);