From 32bfd81051238bf50dbfd2b95cf811c8eeb35b69 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 14 Aug 2012 16:40:33 -0500 Subject: [PATCH] windowscodecs: Allow CopyPixels to succeed without padding from the last row. --- dlls/windowscodecs/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 091b9fb0487..2898d970dfe 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -82,7 +82,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (dststride < bytesperrow) return E_INVALIDARG; - if ((dststride * rc->Height) > dstbuffersize) + if ((dststride * (rc->Height-1)) + ((rc->Width * bpp) + 7)/8 > dstbuffersize) return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */