am 82e90e10: Merge "Fix integer overflow when handling MPEG4 tx3g atom" into klp-dev (1f44d837) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+7 −0

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

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

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

		if (size > 0) {
		memcpy(buffer, data, size);