Commit 7d62a918 authored Apr 11, 2015 by Nick Kralevich Committed by Android Git Automerger Apr 11, 2015

am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix...

am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev

* commit '14c686c0':
  Fix integer overflow during MP4 atom processing

parents 75a8776e 14c686c0

media/libstagefright/SampleTable.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,9 @@ status_t SampleTable::setSampleToChunkParams(
		return ERROR_MALFORMED;
		}

		if (SIZE_MAX / sizeof(SampleToChunkEntry) <= mNumSampleToChunkOffsets)
		return ERROR_OUT_OF_RANGE;

		mSampleToChunkEntries =
		new SampleToChunkEntry[mNumSampleToChunkOffsets];