Merge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev (74b10b83) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/on2/dec/SoftVPX.cpp

+19 −3

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ void SoftVPX::onQueueFilled(OMX_U32 portIndex) {
		outHeader->nFlags = EOSseen ? OMX_BUFFERFLAG_EOS : 0;
		outHeader->nTimeStamp = inHeader->nTimeStamp;

		if (outHeader->nAllocLen >= outHeader->nFilledLen) {
		if (outputBufferSafe(outHeader)) {
		const uint8_t srcLine = (const uint8_t )img->planes[VPX_PLANE_Y];
		uint8_t *dst = outHeader->pBuffer;
		for (size_t i = 0; i < img->d_h; ++i) {
		@@ -181,8 +181,6 @@ void SoftVPX::onQueueFilled(OMX_U32 portIndex) {
		dst += img->d_w / 2;
		}
		} else {
		ALOGE("b/27597103, buffer too small");
		android_errorWriteLog(0x534e4554, "27597103");
		outHeader->nFilledLen = 0;
		}
		outInfo->mOwnedByUs = false;
		@@ -200,6 +198,24 @@ void SoftVPX::onQueueFilled(OMX_U32 portIndex) {
		}
		}

		bool SoftVPX::outputBufferSafe(OMX_BUFFERHEADERTYPE *outHeader) {
		uint32_t width = mWidth;
		uint32_t height = mHeight;
		uint64_t nFilledLen = width;
		nFilledLen *= height;
		if (nFilledLen > UINT32_MAX / 3) {
		ALOGE("b/29421675, nFilledLen overflow %llu w %u h %u", nFilledLen, width, height);
		android_errorWriteLog(0x534e4554, "29421675");
		return false;
		} else if (outHeader->nAllocLen < outHeader->nFilledLen) {
		ALOGE("b/27597103, buffer too small");
		android_errorWriteLog(0x534e4554, "27597103");
		return false;
		}

		return true;
		}

		} // namespace android

		android::SoftOMXComponent *createSoftOMXComponent(

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ private:
		void *mCtx;

		status_t initDecoder();
		bool outputBufferSafe(OMX_BUFFERHEADERTYPE *outHeader);

		DISALLOW_EVIL_CONSTRUCTORS(SoftVPX);
		};