Merge "Fail more gracefully on allocation failure" into klp-dev (8a064aa8) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+20 −7

Original line number	Diff line number	Diff line
		@@ -366,7 +366,7 @@ MPEG4Extractor::~MPEG4Extractor() {
		SINF *sinf = mFirstSINF;
		while (sinf) {
		SINF *next = sinf->next;
		delete sinf->IPMPData;
		delete[] sinf->IPMPData;
		delete sinf;
		sinf = next;
		}
		@@ -683,7 +683,11 @@ status_t MPEG4Extractor::parseDrmSINF(off64_t *offset, off64_t data_offset) {
		return ERROR_MALFORMED;
		}
		sinf->len = dataLen - 3;
		sinf->IPMPData = new char[sinf->len];
		sinf->IPMPData = new (std::nothrow) char[sinf->len];
		if (sinf->IPMPData == NULL) {
		return ERROR_MALFORMED;
		}
		data_offset += 2;

		if (mDataSource->readAt(data_offset + 2, sinf->IPMPData, sinf->len) < sinf->len) {
		return ERROR_IO;
		@@ -1077,7 +1081,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		return ERROR_MALFORMED;
		}

		pssh.data = new uint8_t[pssh.datalen];
		pssh.data = new (std::nothrow) uint8_t[pssh.datalen];
		if (pssh.data == NULL) {
		return ERROR_MALFORMED;
		}
		ALOGV("allocated pssh @ %p", pssh.data);
		ssize_t requested = (ssize_t) pssh.datalen;
		if (mDataSource->readAt(data_offset + 24, pssh.data, requested) < requested) {
		@@ -1743,8 +1750,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		if ((chunk_size > SIZE_MAX) \|\| (SIZE_MAX - chunk_size <= size)) {
		return ERROR_MALFORMED;
		}

		uint8_t *buffer = new uint8_t[size + chunk_size];
		uint8_t *buffer = new (std::nothrow) uint8_t[size + chunk_size];
		if (buffer == NULL) {
		return ERROR_MALFORMED;
		}
		@@ -2037,7 +2043,10 @@ status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) {
		return ERROR_MALFORMED;
		}

		uint8_t *buffer = new uint8_t[size + 1];
		uint8_t *buffer = new (std::nothrow) uint8_t[size + 1];
		if (buffer == NULL) {
		return ERROR_MALFORMED;
		}
		if (mDataSource->readAt(
		offset, buffer, size) != (ssize_t)size) {
		delete[] buffer;
		@@ -2502,7 +2511,11 @@ status_t MPEG4Source::start(MetaData *params) {

		mGroup->add_buffer(new MediaBuffer(max_size));

		mSrcBuffer = new uint8_t[max_size];
		mSrcBuffer = new (std::nothrow) uint8_t[max_size];
		if (mSrcBuffer == NULL) {
		// file probably specified a bad max size
		return ERROR_MALFORMED;
		}

		mStarted = true;