am dc5e47f0: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data. (c642d411) · Commits · e / os / android_frameworks_av

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+8 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) {
		}

		void SoftwareRenderer::render(
		const void data, size_t /size*/, int64_t timestampNs,
		const void *data, size_t size, int64_t timestampNs,
		void* /platformPrivate/, const sp<AMessage>& format) {
		resetFormatIfChanged(format);

		@@ -209,6 +209,9 @@ void SoftwareRenderer::render(
		buf->stride, buf->height,
		0, 0, mCropWidth - 1, mCropHeight - 1);
		} else if (mColorFormat == OMX_COLOR_FormatYUV420Planar) {
		if ((size_t)mWidth * mHeight * 3 / 2 > size) {
		goto skip_copying;
		}
		const uint8_t src_y = (const uint8_t )data;
		const uint8_t src_u = (const uint8_t )data + mWidth * mHeight;
		const uint8_t src_v = src_u + (mWidth / 2 mHeight / 2);
		@@ -238,6 +241,9 @@ void SoftwareRenderer::render(
		}
		} else {
		CHECK_EQ(mColorFormat, OMX_TI_COLOR_FormatYUV420PackedSemiPlanar);
		if ((size_t)mWidth * mHeight * 3 / 2 > size) {
		goto skip_copying;
		}

		const uint8_t *src_y =
		(const uint8_t *)data;
		@@ -273,6 +279,7 @@ void SoftwareRenderer::render(
		}
		}

		skip_copying:
		CHECK_EQ(0, mapper.unlock(buf->handle));

		if ((err = native_window_set_buffers_timestamp(mNativeWindow.get(),