generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In planarCopyWrapper, Only copy length, not stride of the last line in the plane

Browse Source 
If the destination planes are offset within the destination buffer,
writing the extra bytes at the end may write outside of the destination
buffer.

Originally committed as revision 31746 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Martin Storsjö 2010-07-16 17:45:50 +00:00
parent 66b84e4ab2
commit c4e2b8268f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libswscale/swscale.c
View File

@ -1663,9 +1663,11 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
srcPtr+= srcStride[plane];
dstPtr+= dstStride[plane];
}
} else if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0)
memcpy(dst[plane] + dstStride[plane]*y, src[plane], height*dstStride[plane]);
else {
} else if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0) {
if (height > 0)
memcpy(dst[plane] + dstStride[plane]*y, src[plane],
(height - 1)*dstStride[plane] + length);
} else {
if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat))
length*=2;
for (i=0; i<height; i++) {