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

am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77:...

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

* commit '2fe61ed0':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX

parents 2c0f9591 2fe61ed0

media/libstagefright/MPEG4Extractor.cpp

+1 −1

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

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