Commit e168bdd2 authored Jun 10, 2015 by Wei Jia Committed by Android Git Automerger Jun 10, 2015

am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for...

am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev

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

parents 9784b406 f19acf48

media/libstagefright/MPEG4Extractor.cpp

+4 −0

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