Merge "Detect allocation failures and bail gracefully" (8b882f23) · Commits · e / os / android_frameworks_av

media/libstagefright/SampleTable.cpp

+16 −5

Original line number	Diff line number	Diff line
		@@ -231,7 +231,9 @@ status_t SampleTable::setSampleToChunkParams(
		}

		mSampleToChunkEntries =
		new SampleToChunkEntry[mNumSampleToChunkOffsets];
		new (std::nothrow) SampleToChunkEntry[mNumSampleToChunkOffsets];
		if (!mSampleToChunkEntries)
		return ERROR_OUT_OF_RANGE;

		for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {
		uint8_t buffer[12];
		@@ -334,7 +336,9 @@ status_t SampleTable::setTimeToSampleParams(
		if (allocSize > SIZE_MAX) {
		return ERROR_OUT_OF_RANGE;
		}
		mTimeToSample = new uint32_t[mTimeToSampleCount * 2];
		mTimeToSample = new (std::nothrow) uint32_t[mTimeToSampleCount * 2];
		if (!mTimeToSample)
		return ERROR_OUT_OF_RANGE;

		size_t size = sizeof(uint32_t) * mTimeToSampleCount * 2;
		if (mDataSource->readAt(
		@@ -381,7 +385,9 @@ status_t SampleTable::setCompositionTimeToSampleParams(
		return ERROR_OUT_OF_RANGE;
		}

		mCompositionTimeDeltaEntries = new uint32_t[2 * numEntries];
		mCompositionTimeDeltaEntries = new (std::nothrow) uint32_t[2 * numEntries];
		if (!mCompositionTimeDeltaEntries)
		return ERROR_OUT_OF_RANGE;

		if (mDataSource->readAt(
		data_offset + 8, mCompositionTimeDeltaEntries, numEntries * 8)
		@@ -431,7 +437,10 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
		return ERROR_OUT_OF_RANGE;
		}

		mSyncSamples = new uint32_t[mNumSyncSamples];
		mSyncSamples = new (std::nothrow) uint32_t[mNumSyncSamples];
		if (!mSyncSamples)
		return ERROR_OUT_OF_RANGE;

		size_t size = mNumSyncSamples * sizeof(uint32_t);
		if (mDataSource->readAt(mSyncSampleOffset + 8, mSyncSamples, size)
		!= (ssize_t)size) {
		@@ -499,7 +508,9 @@ void SampleTable::buildSampleEntriesTable() {
		return;
		}

		mSampleTimeEntries = new SampleTimeEntry[mNumSampleSizes];
		mSampleTimeEntries = new (std::nothrow) SampleTimeEntry[mNumSampleSizes];
		if (!mSampleTimeEntries)
		return;

		uint32_t sampleIndex = 0;
		uint32_t sampleTime = 0;