Commit 3b8d3fa0 authored Aug 11, 2015 by Nick Kralevich Committed by Android Git Automerger Aug 11, 2015

am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp:...

am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '186d1fb9':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX

parents 9fff1d37 186d1fb9

media/libstagefright/MPEG4Extractor.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1567,7 +1567,7 @@ status_t MPEG4Extractor::parseTrackHeader(
	}		}

	status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) {		status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) {
	if (size < 4) {		if (size < 4 \|\| size == SIZE_MAX) {
	return ERROR_MALFORMED;		return ERROR_MALFORMED;
	}		}