[PATCH v2] gdiplus: Each pen dash array element must be greater than zero.

[Jeff Smith]

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com>
---
 dlls/gdiplus/pen.c       | 5 +----
 dlls/gdiplus/tests/pen.c | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c
index 8bcb91819a..156f90a19d 100644
--- a/dlls/gdiplus/pen.c
+++ b/dlls/gdiplus/pen.c
@@ -598,13 +598,10 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash,
 
     for(i = 0; i < count; i++){
         sum += dash[i];
-        if(dash[i] < 0.0)
+        if(dash[i] <= 0.0)
             return InvalidParameter;
     }
 
-    if(sum == 0.0 && count)
-        return InvalidParameter;
-
     heap_free(pen->dashes);
     pen->dashes = NULL;
 
diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c
index ceab92acff..85528a3700 100644
--- a/dlls/gdiplus/tests/pen.c
+++ b/dlls/gdiplus/tests/pen.c
@@ -175,7 +175,7 @@ static void test_dasharray(void)
     dashes[4] = 14.0;
     dashes[5] = -100.0;
     dashes[6] = -100.0;
-    dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 0.0;
+    dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 1.0;
 
     /* setting the array sets the type to custom */
     GdipGetPenDashStyle(pen, &style);
@@ -217,6 +217,7 @@ static void test_dasharray(void)
     expectf(-100.0, dashes[6]);
 
     /* Some invalid array values. */
+    dashes[9] = 0.0;
     status = GdipSetPenDashArray(pen, &dashes[7], 5);
     expect(InvalidParameter, status);
     dashes[9] = -1.0;
-- 
2.23.0

[Vincent Povirk (they/them)]

> /* Some invalid array values. */
> +    dashes[9] = 0.0;
>      status = GdipSetPenDashArray(pen, &dashes[7], 5);
>      expect(InvalidParameter, status);
>      dashes[9] = -1.0;

Please test the result of GdipSetPenDashArray with those arguments
before changing dashes[9]. I'd like to see that we start out with
valid arguments, so we can be sure we didn't make the same mistake
again.