Skip to content

W
wine-winehq
Commit 0f6a66e9 authored by Bernhard Übelacker's avatar Bernhard Übelacker Committed by Alexandre Julliard
Browse files
Options

wing32: Avoid crash in WinGGetDIBPointer when called with NULL bitmap info.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56135
parent edf0635e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
dlls/wing32/tests/wing32.c
View file @ 0f6a66e9
...@@ -51,6 +51,9 @@ static void test_WinGGetDIBPointer(void) ...@@ -51,6 +51,9 @@ static void test_WinGGetDIBPointer(void)
dib = WinGGetDIBPointer(NULL, NULL); dib = WinGGetDIBPointer(NULL, NULL);
ok(dib == NULL, "WinGGetDIBPointer returned unexpected value %p\n", dib); ok(dib == NULL, "WinGGetDIBPointer returned unexpected value %p\n", dib);
dib = WinGGetDIBPointer(bmp, NULL);
ok(dib != NULL, "WinGGetDIBPointer failed\n");
dib = WinGGetDIBPointer(bmp, &bmi); dib = WinGGetDIBPointer(bmp, &bmi);
ok(dib != NULL, "WinGGetDIBPointer failed\n"); ok(dib != NULL, "WinGGetDIBPointer failed\n");
......
dlls/wing32/wing32.c
View file @ 0f6a66e9
...@@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) ...@@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi )
if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds))
{ {
bmi->bmiHeader = ds.dsBmih; if (bmi) bmi->bmiHeader = ds.dsBmih;
return ds.dsBm.bmBits; return ds.dsBm.bmBits;
} }
return NULL; return NULL;
......
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