mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed argument checks.

Browse Source
This commit is contained in:
Armin Novak 2015-08-05 17:32:38 +02:00
parent 0cbc46dc34
commit 4df5e2b998
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfreerdp/codec/color.c
View File

@ -1463,12 +1463,18 @@ int freerdp_image_copy_from_pointer_data(BYTE* pDstData, UINT32 DstFormat, int n
andStep = (nWidth + 7) / 8; andStep = (nWidth + 7) / 8;
andStep += (andStep % 2); andStep += (andStep % 2);
if (!xorMask)
return -1;
if (dstBytesPerPixel == 4) if (dstBytesPerPixel == 4)
{ {
UINT32* pDstPixel; UINT32* pDstPixel;
if (xorBpp == 1) if (xorBpp == 1)
{ {
if (!andMask)
return -1;
xorStep = (nWidth + 7) / 8; xorStep = (nWidth + 7) / 8;
xorStep += (xorStep % 2); xorStep += (xorStep % 2);
@ -1481,14 +1487,12 @@ int freerdp_image_copy_from_pointer_data(BYTE* pDstData, UINT32 DstFormat, int n
if (!vFlip) if (!vFlip)
{ {
xorBits = &xorMask[xorStep * y]; xorBits = &xorMask[xorStep * y];
if (andMask) andBits = &andMask[andStep * y];
andBits = &andMask[andStep * y];
} }
else else
{ {
xorBits = &xorMask[xorStep * (nHeight - y - 1)]; xorBits = &xorMask[xorStep * (nHeight - y - 1)];
if (andMask) andBits = &andMask[andStep * (nHeight - y - 1)];
andBits = &andMask[andStep * (nHeight - y - 1)];
} }
for (x = 0; x < nWidth; x++) for (x = 0; x < nWidth; x++)