Commit bb99a362 authored Aug 07, 2015 by Joshua J. Drake Committed by Android Git Automerger Aug 07, 2015

am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd:...

am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit '8d60fc3e':
  Fix integer overflow when handling MPEG4 tx3g atom

parents 430475da 8d60fc3e

media/libstagefright/MPEG4Extractor.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -1396,7 +1396,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);