Commit e0601829 authored by Hugh Bellamy's avatar Hugh Bellamy Committed by Alexandre Julliard

gdiplus: Fix validation of HatchStyle in GdipCreateHatchBrush.

parent 071d7c3f
...@@ -250,6 +250,9 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR ...@@ -250,6 +250,9 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR
if(!brush) return InvalidParameter; if(!brush) return InvalidParameter;
if(hatchstyle < HatchStyleMin || hatchstyle > HatchStyleMax)
return InvalidParameter;
*brush = heap_alloc_zero(sizeof(GpHatch)); *brush = heap_alloc_zero(sizeof(GpHatch));
if (!*brush) return OutOfMemory; if (!*brush) return OutOfMemory;
......
...@@ -45,6 +45,33 @@ static void test_constructor_destructor(void) ...@@ -45,6 +45,33 @@ static void test_constructor_destructor(void)
expect(Ok, status); expect(Ok, status);
} }
static void test_createHatchBrush(void)
{
GpStatus status;
GpHatch *brush;
status = GdipCreateHatchBrush(HatchStyleMin, 1, 2, &brush);
expect(Ok, status);
ok(brush != NULL, "Expected the brush to be initialized.");
GdipDeleteBrush((GpBrush *)brush);
status = GdipCreateHatchBrush(HatchStyleMax, 1, 2, &brush);
expect(Ok, status);
ok(brush != NULL, "Expected the brush to be initialized.");
GdipDeleteBrush((GpBrush *)brush);
status = GdipCreateHatchBrush(HatchStyle05Percent, 1, 2, NULL);
expect(InvalidParameter, status);
status = GdipCreateHatchBrush((HatchStyle)(HatchStyleMin - 1), 1, 2, &brush);
expect(InvalidParameter, status);
status = GdipCreateHatchBrush((HatchStyle)(HatchStyleMax + 1), 1, 2, &brush);
expect(InvalidParameter, status);
}
static void test_type(void) static void test_type(void)
{ {
GpStatus status; GpStatus status;
...@@ -1563,6 +1590,7 @@ START_TEST(brush) ...@@ -1563,6 +1590,7 @@ START_TEST(brush)
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
test_constructor_destructor(); test_constructor_destructor();
test_createHatchBrush();
test_type(); test_type();
test_gradientblendcount(); test_gradientblendcount();
test_getblend(); test_getblend();
......
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