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

gdiplus: Fix validation of HatchStyle in GdipCreateHatchBrush. 

Signed-off-by: Hugh Bellamy <hughbellars@gmail.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh Bellamy 2017-09-17 11:46:56 +01:00 committed by Alexandre Julliard
parent 071d7c3fbe
commit e0601829e1
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdiplus/brush.c
View File

@ -250,6 +250,9 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR
if(!brush) return InvalidParameter;
if(hatchstyle < HatchStyleMin || hatchstyle > HatchStyleMax)
return InvalidParameter;
*brush = heap_alloc_zero(sizeof(GpHatch));
if (!*brush) return OutOfMemory;

28
dlls/gdiplus/tests/brush.c
View File

@ -45,6 +45,33 @@ static void test_constructor_destructor(void)
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)
{
GpStatus status;
@ -1563,6 +1590,7 @@ START_TEST(brush)
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
test_constructor_destructor();
test_createHatchBrush();
test_type();
test_gradientblendcount();
test_getblend();