am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev (64cdd5f2) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -3900,7 +3900,10 @@ status_t MPEG4Source::read(
		(const uint8_t *)mBuffer->data() + mBuffer->range_offset();

		size_t nal_size = parseNALSize(src);
		if (mBuffer->range_length() < mNALLengthSize + nal_size) {
		if (mNALLengthSize > SIZE_MAX - nal_size) {
		ALOGE("b/24441553, b/24445122");
		}
		if (mBuffer->range_length() - mNALLengthSize < nal_size) {
		ALOGE("incomplete NAL unit.");

		mBuffer->release();
		@@ -4187,7 +4190,11 @@ status_t MPEG4Source::fragmentedRead(
		(const uint8_t *)mBuffer->data() + mBuffer->range_offset();

		size_t nal_size = parseNALSize(src);
		if (mBuffer->range_length() < mNALLengthSize + nal_size) {
		if (mNALLengthSize > SIZE_MAX - nal_size) {
		ALOGE("b/24441553, b/24445122");
		}

		if (mBuffer->range_length() - mNALLengthSize < nal_size) {
		ALOGE("incomplete NAL unit.");

		mBuffer->release();