From e6f1930116c9f0fa49d931120ea02e4828e1991a Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Tue, 27 Nov 2012 09:15:53 +0000 Subject: [PATCH] gdi32: Simplify the point type checking logic. --- dlls/gdi32/painting.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 74ca8358f3f..354bea93567 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -152,12 +152,11 @@ BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWOR case PT_LINETO: break; case PT_BEZIERTO: - if((i + 2 < count) && (types[i + 1] == PT_BEZIERTO) && - ((types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO)) - { - i += 2; - break; - } + if (i + 2 >= count) return FALSE; + if (types[i + 1] != PT_BEZIERTO) return FALSE; + if ((types[i + 2] & ~PT_CLOSEFIGURE) != PT_BEZIERTO) return FALSE; + i += 2; + break; default: return FALSE; }