Skip to content

W
wine-winehq
Commit f02fcfc3 authored by Joerg Mayer's avatar Joerg Mayer Committed by Alexandre Julliard
Browse files
Options

Fix a sign bug where memcpy was called with negative length.

parent e4960a1f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
graphics/x11drv/dib.c
View file @ f02fcfc3
...@@ -2279,6 +2279,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits, ...@@ -2279,6 +2279,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits,
/* align to 32 bit */ /* align to 32 bit */
DWORD linebytes = (srcwidth * 4); DWORD linebytes = (srcwidth * 4);
DWORD copybytes = linebytes;
if (lines < 0 ) if (lines < 0 )
{ {
...@@ -2296,7 +2297,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits, ...@@ -2296,7 +2297,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits,
/* ==== 24/32 BGR bitmap to 32 BGR dib ==== */ /* ==== 24/32 BGR bitmap to 32 BGR dib ==== */
if ( bmpImage->red_mask == 0xff0000 && bmpImage->blue_mask == 0xff ) if ( bmpImage->red_mask == 0xff0000 && bmpImage->blue_mask == 0xff )
for (h = lines - 1; h >= 0; h--, dstbits+=linebytes) for (h = lines - 1; h >= 0; h--, dstbits+=linebytes)
memcpy( dstbits, bmpImage->data + h*bmpImage->bytes_per_line, linebytes ); memcpy( dstbits, bmpImage->data + h*bmpImage->bytes_per_line, copybytes );
/* ==== 24/32 RGB bitmap to 32 BGR dib ==== */ /* ==== 24/32 RGB bitmap to 32 BGR dib ==== */
else if ( bmpImage->red_mask == 0xff && bmpImage->blue_mask == 0xff0000 ) else if ( bmpImage->red_mask == 0xff && bmpImage->blue_mask == 0xff0000 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment