Merge "Limit mp4 atom size to something reasonable" into nyc-mr1-dev (08e1f417) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,10 @@ namespace android {
		enum {
		// max track header chunk to return
		kMaxTrackHeaderSize = 32,

		// maximum size of an atom. Some atoms can be bigger according to the spec,
		// but we only allow up to this size.
		kMaxAtomSize = 64 * 1024 * 1024,
		};

		class MPEG4Source : public MediaSource {
		@@ -880,6 +884,13 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		ALOGE("b/23540914");
		return ERROR_MALFORMED;
		}
		if (chunk_type != FOURCC('m', 'd', 'a', 't') && chunk_data_size > kMaxAtomSize) {
		char errMsg[100];
		sprintf(errMsg, "%s atom has size %" PRId64, chunk, chunk_data_size);
		ALOGE("%s (b/28615448)", errMsg);
		android_errorWriteWithInfoLog(0x534e4554, "28615448", -1, errMsg, strlen(errMsg));
		return ERROR_MALFORMED;
		}

		if (chunk_type != FOURCC('c', 'p', 'r', 't')
		&& chunk_type != FOURCC('c', 'o', 'v', 'r')