DO NOT MERGE - Merge QP1A.191005.007 into master (520d2cd5) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -1355,6 +1355,14 @@ PV_STATUS DecodeShortHeader(VideoDecData video, Vop currVop)
		int tmpHeight = (tmpDisplayHeight + 15) & -16;
		int tmpWidth = (tmpDisplayWidth + 15) & -16;

		if (tmpWidth > video->width)
		{
		// while allowed by the spec, this decoder does not actually
		// support an increase in size.
		ALOGE("width increase not supported");
		status = PV_FAIL;
		goto return_point;
		}
		if (tmpHeight * tmpWidth > video->size)
		{
		// This is just possibly "b/37079296".