Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am:... (bf68540a) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+18 −0

Original line number	Diff line number	Diff line
		@@ -535,6 +535,10 @@ status_t MPEG4Extractor::readMetaData() {
		}
		if (psshsize > 0 && psshsize <= UINT32_MAX) {
		char buf = (char)malloc(psshsize);
		if (!buf) {
		ALOGE("b/28471206");
		return NO_MEMORY;
		}
		char *ptr = buf;
		for (size_t i = 0; i < mPssh.size(); i++) {
		memcpy(ptr, mPssh[i].uuid, 20); // uuid + length
		@@ -1702,6 +1706,11 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {

		sp<ABuffer> buffer = new ABuffer(chunk_data_size);

		if (buffer->data() == NULL) {
		ALOGE("b/28471206");
		return NO_MEMORY;
		}

		if (mDataSource->readAt(
		data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {
		return ERROR_IO;
		@@ -1719,6 +1728,11 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		{
		sp<ABuffer> buffer = new ABuffer(chunk_data_size);

		if (buffer->data() == NULL) {
		ALOGE("b/28471206");
		return NO_MEMORY;
		}

		if (mDataSource->readAt(
		data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {
		return ERROR_IO;
		@@ -2051,6 +2065,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		return ERROR_MALFORMED;
		}
		sp<ABuffer> buffer = new ABuffer(chunk_data_size + 1);
		if (buffer->data() == NULL) {
		ALOGE("b/28471206");
		return NO_MEMORY;
		}
		if (mDataSource->readAt(
		data_offset, buffer->data(), chunk_data_size) != (ssize_t)chunk_data_size) {
		return ERROR_IO;