resolved conflicts for merge of 1f44d837 to lmp-dev (115e995c) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -1890,6 +1890,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		size = 0;
		}

		if (SIZE_MAX - chunk_size <= size) {
		return ERROR_MALFORMED;
		}

		uint8_t *buffer = new (std::nothrow) uint8_t[size + chunk_size];
		if (buffer == NULL) {
		return ERROR_MALFORMED;