system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdiplus: Check custom dash array for bad properties.

Browse source
This commit is contained in:
Evan Stade 2007-07-27 16:07:47 -07:00 committed by Alexandre Julliard
parent a35206e08e
commit b6b7e915c3
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/gdiplus/pen.c
View file

@ -223,9 +223,21 @@ GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen *pen, GpCustomLineCap* custom
GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash,
INT count)
{
INT i;
REAL sum = 0;
if(!pen || !dash)
return InvalidParameter;
for(i = 0; i < count; i++){
sum += dash[i];
if(dash[i] < 0.0)
return InvalidParameter;
}
if(sum == 0.0 && count)
return InvalidParameter;
GdipFree(pen->dashes);
pen->dashes = NULL;

6
dlls/gdiplus/tests/pen.c
View file

@ -176,12 +176,10 @@ static void test_dasharray(void)
/* Some invalid array values. */
status = GdipSetPenDashArray(pen, &dashes[7], 5);
todo_wine
expect(InvalidParameter, status);
expect(InvalidParameter, status);
dashes[9] = -1.0;
status = GdipSetPenDashArray(pen, &dashes[7], 5);
todo_wine
expect(InvalidParameter, status);
expect(InvalidParameter, status);
/* Try to set with count = 0. */
GdipSetPenDashStyle(pen, DashStyleDot);