Vincent Povirk : gdiplus: Reject linear gradients where the start and end points are equal.
Alexandre Julliard
julliard at winehq.org
Thu Oct 28 12:19:52 CDT 2010
Module: wine
Branch: master
Commit: 2661ce79d6ac59822aab535e5b0f70e2378d550e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2661ce79d6ac59822aab535e5b0f70e2378d550e
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Wed Oct 27 18:02:30 2010 -0500
gdiplus: Reject linear gradients where the start and end points are equal.
---
dlls/gdiplus/brush.c | 3 +++
dlls/gdiplus/tests/brush.c | 18 ++++++++++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index 02d1522..c3e25d6 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -325,6 +325,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint,
if(!line || !startpoint || !endpoint || wrap == WrapModeClamp)
return InvalidParameter;
+ if (startpoint->X == endpoint->X && startpoint->Y == endpoint->Y)
+ return OutOfMemory;
+
*line = GdipAlloc(sizeof(GpLineGradient));
if(!*line) return OutOfMemory;
diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c
index 0effcf4..648a1d3 100644
--- a/dlls/gdiplus/tests/brush.c
+++ b/dlls/gdiplus/tests/brush.c
@@ -356,6 +356,20 @@ static void test_gradientgetrect(void)
expectf(100.0, rectf.Width);
expectf(1.0, rectf.Height);
status = GdipDeleteBrush((GpBrush*)brush);
+ /* zero height rect */
+ rectf.X = rectf.Y = 10.0;
+ rectf.Width = 100.0;
+ rectf.Height = 0.0;
+ status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeVertical,
+ WrapModeTile, &brush);
+ expect(OutOfMemory, status);
+ /* zero width rect */
+ rectf.X = rectf.Y = 10.0;
+ rectf.Width = 0.0;
+ rectf.Height = 100.0;
+ status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeHorizontal,
+ WrapModeTile, &brush);
+ expect(OutOfMemory, status);
/* from rect with LinearGradientModeHorizontal */
rectf.X = rectf.Y = 10.0;
rectf.Width = rectf.Height = 100.0;
@@ -401,6 +415,10 @@ static void test_lineblend(void)
REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f};
ARGB res_colors[6] = {0xdeadbeef, 0, 0, 0, 0};
+ pt1.X = pt1.Y = pt2.Y = pt2.X = 1.0;
+ status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush);
+ expect(OutOfMemory, status);
+
pt1.X = pt1.Y = 1.0;
pt2.X = pt2.Y = 100.0;
status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush);
More information about the wine-cvs
mailing list