am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before... (03b7f72b) · Commits · e / os / android_frameworks_av

media/libstagefright/Utils.cpp

+16 −5

Original line number	Diff line number	Diff line
		@@ -160,8 +160,10 @@ status_t convertMetaDataToMessage(

		const uint8_t ptr = (const uint8_t )data;

		CHECK(size >= 7);
		CHECK_EQ((unsigned)ptr[0], 1u); // configurationVersion == 1
		if (size < 7 \|\| ptr[0] != 1) { // configurationVersion == 1
		ALOGE("b/23680780");
		return BAD_VALUE;
		}
		uint8_t profile = ptr[1];
		uint8_t level = ptr[3];

		@@ -187,7 +189,10 @@ status_t convertMetaDataToMessage(
		buffer->setRange(0, 0);

		for (size_t i = 0; i < numSeqParameterSets; ++i) {
		CHECK(size >= 2);
		if (size < 2) {
		ALOGE("b/23680780");
		return BAD_VALUE;
		}
		size_t length = U16_AT(ptr);

		ptr += 2;
		@@ -216,13 +221,19 @@ status_t convertMetaDataToMessage(
		}
		buffer->setRange(0, 0);

		CHECK(size >= 1);
		if (size < 1) {
		ALOGE("b/23680780");
		return BAD_VALUE;
		}
		size_t numPictureParameterSets = *ptr;
		++ptr;
		--size;

		for (size_t i = 0; i < numPictureParameterSets; ++i) {
		CHECK(size >= 2);
		if (size < 2) {
		ALOGE("b/23680780");
		return BAD_VALUE;
		}
		size_t length = U16_AT(ptr);

		ptr += 2;