Merge "Fix overflow check so it doesn't reject legitimate files" (7534cb3a) · Commits · e / os / android_frameworks_av

media/libstagefright/SampleTable.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ status_t SampleTable::setSampleToChunkParams(
		for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {
		uint8_t buffer[12];

		if ((off64_t)((SIZE_MAX / 12) - 8 - i) < mSampleToChunkOffset) {
		if ((off64_t)(SIZE_MAX - 8 - (i * 12)) < mSampleToChunkOffset) {
		return ERROR_MALFORMED;
		}