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

media/libstagefright/SampleTable.cpp

+16 −5

Original line number	Original line	Diff line number	Diff line
	@@ -234,7 +234,9 @@ status_t SampleTable::setSampleToChunkParams(
	return ERROR_OUT_OF_RANGE;		return ERROR_OUT_OF_RANGE;

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

	for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {		for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {
	uint8_t buffer[12];		uint8_t buffer[12];
	@@ -337,7 +339,9 @@ status_t SampleTable::setTimeToSampleParams(
	if (allocSize > SIZE_MAX) {		if (allocSize > SIZE_MAX) {
	return ERROR_OUT_OF_RANGE;		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;		size_t size = sizeof(uint32_t) * mTimeToSampleCount * 2;
	if (mDataSource->readAt(		if (mDataSource->readAt(
	@@ -384,7 +388,9 @@ status_t SampleTable::setCompositionTimeToSampleParams(
	return ERROR_OUT_OF_RANGE;		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(		if (mDataSource->readAt(
	data_offset + 8, mCompositionTimeDeltaEntries, numEntries * 8)		data_offset + 8, mCompositionTimeDeltaEntries, numEntries * 8)
	@@ -434,7 +440,10 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
	return ERROR_OUT_OF_RANGE;		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);		size_t size = mNumSyncSamples * sizeof(uint32_t);
	if (mDataSource->readAt(mSyncSampleOffset + 8, mSyncSamples, size)		if (mDataSource->readAt(mSyncSampleOffset + 8, mSyncSamples, size)
	!= (ssize_t)size) {		!= (ssize_t)size) {
	@@ -502,7 +511,9 @@ void SampleTable::buildSampleEntriesTable() {
	return;		return;
	}		}

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

	uint32_t sampleIndex = 0;		uint32_t sampleIndex = 0;
	uint32_t sampleTime = 0;		uint32_t sampleTime = 0;