wing32: Avoid crash in WinGGetDIBPointer when called with NULL bitmap info.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56135
This commit is contained in:
parent
edf0635ed4
commit
0f6a66e919
2 changed files with 4 additions and 1 deletions
|
@ -51,6 +51,9 @@ static void test_WinGGetDIBPointer(void)
|
|||
dib = WinGGetDIBPointer(NULL, NULL);
|
||||
ok(dib == NULL, "WinGGetDIBPointer returned unexpected value %p\n", dib);
|
||||
|
||||
dib = WinGGetDIBPointer(bmp, NULL);
|
||||
ok(dib != NULL, "WinGGetDIBPointer failed\n");
|
||||
|
||||
dib = WinGGetDIBPointer(bmp, &bmi);
|
||||
ok(dib != NULL, "WinGGetDIBPointer failed\n");
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi )
|
|||
|
||||
if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds))
|
||||
{
|
||||
bmi->bmiHeader = ds.dsBmih;
|
||||
if (bmi) bmi->bmiHeader = ds.dsBmih;
|
||||
return ds.dsBm.bmBits;
|
||||
}
|
||||
return NULL;
|
||||
|
|
Loading…
Add table
Reference in a new issue