Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread (7b5b27ad) · Commits · e / os / android_frameworks_base

media/libstagefright/MPEG4Extractor.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -428,6 +428,14 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) {
		}
		chunk_size = ntoh64(chunk_size);
		data_offset += 8;

		if (chunk_size < 16) {
		// The smallest valid chunk is 16 bytes long in this case.
		return ERROR_MALFORMED;
		}
		} else if (chunk_size < 8) {
		// The smallest valid chunk is 8 bytes long.
		return ERROR_MALFORMED;
		}

		char chunk[5];