From: Elton Chung <elton@elton.tk>
Subject: [PATCH] gdiplus: fixing identical sub-expressions
Message-Id: <CAFjiJx7ZX9MU8Hfvqb6erioqy2t2v8PLMVV2N7UmwvGY_z_nLA@mail.gmail.com>
Date: Sat, 6 Jul 2013 18:32:15 +0800

From dd1b2a40e37a4569ec6baf8785e0f04ebaf05d83 Mon Sep 17 00:00:00 2001
From: Elton Chung <elton+wine@elton.tk>
Date: Sat, 6 Jul 2013 18:25:18 +0800
Subject: [PATCH] gdiplus: fixing identical sub-expressions

There are identical sub-expressions '!(types[i + 1] &
 PathPointTypeBezier)' to the left and to the right of the '||' operator.

Credits to PVS-Studio:
http://www.viva64.com/en/b/0192/#ID0EYFAG

Solution given by Vincent Povirk.
---
 dlls/gdiplus/graphics.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index dcdc29e..89bb4f5 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -1748,7 +1748,7 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen
*pen, GDIPCONST GpPointF *
     for(i = 1; i < count; i++){
         if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier){
             if((i + 2 >= count) || !(types[i + 1] & PathPointTypeBezier)
-                || !(types[i + 1] & PathPointTypeBezier)){
+                || !(types[i + 2] & PathPointTypeBezier)){
                 ERR("Bad bezier points\n");
                 goto end;
             }
-- 
1.8.1.msysgit.1

<div dir="ltr"><div>From dd1b2a40e37a4569ec6baf8785e0f04ebaf05d83 Mon Sep 17 00:00:00 2001</div><div>From: Elton Chung &lt;<a href="mailto:elton%2Bwine@elton.tk">elton+wine@elton.tk</a>&gt;</div><div>Date: Sat, 6 Jul 2013 18:25:18 +0800</div>

<div>Subject: [PATCH] gdiplus: fixing identical sub-expressions</div><div><br></div><div>There are identical sub-expressions &#39;!(types[i + 1] &amp;</div><div> PathPointTypeBezier)&#39; to the left and to the right of the &#39;||&#39; operator.</div>

<div><br></div><div>Credits to PVS-Studio:</div><div><a href="http://www.viva64.com/en/b/0192/#ID0EYFAG">http://www.viva64.com/en/b/0192/#ID0EYFAG</a></div><div><br></div><div>Solution given by Vincent Povirk.</div><div>
---</div>
<div> dlls/gdiplus/graphics.c | 2 +-</div><div> 1 file changed, 1 insertion(+), 1 deletion(-)</div><div><br></div><div>diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c</div><div>index dcdc29e..89bb4f5 100644</div>

<div>--- a/dlls/gdiplus/graphics.c</div><div>+++ b/dlls/gdiplus/graphics.c</div><div>@@ -1748,7 +1748,7 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *</div><div>     for(i = 1; i &lt; count; i++){</div>

<div>         if((types[i] &amp; PathPointTypePathTypeMask) == PathPointTypeBezier){</div><div>             if((i + 2 &gt;= count) || !(types[i + 1] &amp; PathPointTypeBezier)</div><div>-                || !(types[i + 1] &amp; PathPointTypeBezier)){</div>

<div>+                || !(types[i + 2] &amp; PathPointTypeBezier)){</div><div>                 ERR(&quot;Bad bezier points\n&quot;);</div><div>                 goto end;</div><div>             }</div><div>-- </div><div>
1.8.1.msysgit.1</div>
<div><br></div></div>