Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev (3ec4f550) · Commits · e / os / android_frameworks_av

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -343,7 +343,7 @@ Bool PVAllocVideoData(VideoDecControls *decCtrl, int width, int height, int nLay
		video->prevVop->uChan = video->prevVop->yChan + size;
		video->prevVop->vChan = video->prevVop->uChan + (size >> 2);
		#else
		if (size > INT32_MAX / 3 * 2) {
		if (size > INT32_MAX / 3) {
		return PV_FALSE;
		}
		video->currVop->yChan = (PIXEL ) oscl_malloc(size 3 / 2); /* Allocate memory for all VOP OKA 3/2/1*/
		@@ -373,7 +373,7 @@ Bool PVAllocVideoData(VideoDecControls *decCtrl, int width, int height, int nLay
		{
		oscl_memset(video->prevEnhcVop, 0, sizeof(Vop));
		#ifndef PV_MEMORY_POOL
		if (size > INT32_MAX / 3 * 2) {
		if (size > INT32_MAX / 3) {
		return PV_FALSE;
		}