ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Add a check for null bitfields in SetDIBits.

This commit is contained in:
Alexandre Julliard 2011-10-13 00:43:05 +02:00
parent a413916802
commit 34310d4479
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/gdi32/dib.c
View File

@ -519,6 +519,15 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan,
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
return 0; return 0;
} }
if (src_info->bmiHeader.biCompression == BI_BITFIELDS)
{
DWORD *masks = (DWORD *)src_info->bmiColors;
if (!masks[0] || !masks[1] || !masks[2])
{
SetLastError( ERROR_INVALID_PARAMETER );
return 0;
}
}
src_bits.ptr = (void *)bits; src_bits.ptr = (void *)bits;
src_bits.is_copy = FALSE; src_bits.is_copy = FALSE;

6
dlls/gdi32/tests/bitmap.c
View File

@ -976,7 +976,7 @@ static void test_dib_formats(void)
hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0);
ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" );
ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS);
todo_wine ok( !ret, "SetDIBits succeeded with null bitfields\n" ); ok( !ret, "SetDIBits succeeded with null bitfields\n" );
/* other functions don't check */ /* other functions don't check */
hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS );
ok( hdib != NULL, "CreateDIBitmap failed with null bitfields\n" ); ok( hdib != NULL, "CreateDIBitmap failed with null bitfields\n" );
@ -984,7 +984,7 @@ static void test_dib_formats(void)
ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS );
ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); ok( ret, "SetDIBitsToDevice failed with null bitfields\n" );
ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY );
ok( ret, "StretchDIBits failed with null bitfields\n" ); todo_wine ok( ret, "StretchDIBits failed with null bitfields\n" );
ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS); ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS);
ok( ret, "GetDIBits failed with null bitfields\n" ); ok( ret, "GetDIBits failed with null bitfields\n" );
bi->bmiHeader.biPlanes = 1; bi->bmiHeader.biPlanes = 1;
@ -1004,7 +1004,7 @@ static void test_dib_formats(void)
hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0);
ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" );
ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS);
todo_wine ok( !ret, "SetDIBits succeeded with null bitfields\n" ); ok( !ret, "SetDIBits succeeded with null bitfields\n" );
/* garbage is ok though */ /* garbage is ok though */
*(DWORD *)&bi->bmiColors[0] = 0x55; *(DWORD *)&bi->bmiColors[0] = 0x55;