[PATCH 1/1] gdiplus: Add check of type parameter to be positive (ASan).

[Bernhard Übelacker]

From: Bernhard Übelacker

---
 dlls/gdiplus/gdiplus_private.h |  7 +++++++
 dlls/gdiplus/graphics.c        |  3 +++
 dlls/gdiplus/imageattributes.c | 14 +++++++-------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 9d0a166fdeb..50a642a5364 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -710,4 +710,11 @@ static inline void set_rect(GpRectF *rect, REAL x, REAL y, REAL width, REAL heig
     rect->Height = height;
 }

+static inline int is_valid_ColorAdjustType(ColorAdjustType type)
+{
+    if (type >= ColorAdjustTypeDefault && type < ColorAdjustTypeCount)
+        return TRUE;
+    return FALSE;
+}
+
 #endif
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index a2b5649222f..d2abfdac9ad 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -854,6 +854,9 @@ PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d
     UINT x, y;
     INT i;

+    if (!is_valid_ColorAdjustType(type))
+        return InvalidParameter;
+
     if ((attributes->noop[type] == IMAGEATTR_NOOP_UNDEFINED &&
             attributes->noop[ColorAdjustTypeDefault] == IMAGEATTR_NOOP_SET) ||
             (attributes->noop[type] == IMAGEATTR_NOOP_SET))
diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c
index 349e52f5be9..c5328a37209 100644
--- a/dlls/gdiplus/imageattributes.c
+++ b/dlls/gdiplus/imageattributes.c
@@ -117,7 +117,7 @@ GpStatus WINGDIPAPI GdipGetImageAttributesAdjustedPalette(GpImageAttributes *ima
     TRACE("(%p,%p,%u)\n", imageattr, palette, type);

if (!imageattr || !palette || !palette->Count ||
-        type >= ColorAdjustTypeCount || type == ColorAdjustTypeDefault)
+        !is_valid_ColorAdjustType(type) || type == ColorAdjustTypeDefault)
         return InvalidParameter;

apply_image_attributes(imageattr, (LPBYTE)palette->Entries, palette->Count, 1, 0,
@@ -131,7 +131,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr
 {
     TRACE("(%p,%u,%i,%08lx,%08lx)\n", imageattr, type, enableFlag, colorLow, colorHigh);

-    if(!imageattr || type >= ColorAdjustTypeCount)
+    if(!imageattr || !is_valid_ColorAdjustType(type))
         return InvalidParameter;

imageattr->colorkeys[type].enabled = enableFlag;
@@ -148,7 +148,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes *imageat
     TRACE("(%p,%u,%i,%p,%p,%u)\n", imageattr, type, enableFlag, colorMatrix,
         grayMatrix, flags);

-    if(!imageattr || type >= ColorAdjustTypeCount || flags > ColorMatrixFlagsAltGray)
+    if(!imageattr || !is_valid_ColorAdjustType(type) || flags > ColorMatrixFlagsAltGray)
         return InvalidParameter;

if (enableFlag)
@@ -206,7 +206,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr,
 {
     TRACE("(%p,%u,%i,%0.2f)\n", imageAttr, type, enableFlag, gamma);

-    if (!imageAttr || (enableFlag && gamma <= 0.0) || type >= ColorAdjustTypeCount)
+    if (!imageAttr || (enableFlag && gamma <= 0.0) || !is_valid_ColorAdjustType(type))
         return InvalidParameter;

imageAttr->gamma_enabled[type] = enableFlag;
@@ -220,7 +220,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr,
 {
     TRACE("(%p,%u,%i)\n", imageAttr, type, enableFlag);

-    if (type >= ColorAdjustTypeCount)
+    if (!is_valid_ColorAdjustType(type))
         return InvalidParameter;

imageAttr->noop[type] = enableFlag ? IMAGEATTR_NOOP_SET : IMAGEATTR_NOOP_CLEAR;
@@ -263,7 +263,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt

TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map);

-    if(!imageAttr || type >= ColorAdjustTypeCount)
+    if(!imageAttr || !is_valid_ColorAdjustType(type))
    return InvalidParameter;

if (enableFlag)
@@ -325,7 +325,7 @@ GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes *imageAttr,
 {
     TRACE("(%p,%u)\n", imageAttr, type);

-    if(!imageAttr || type >= ColorAdjustTypeCount)
+    if(!imageAttr || !is_valid_ColorAdjustType(type))
         return InvalidParameter;

memset(&imageAttr->colormatrices[type], 0, sizeof(imageAttr->colormatrices[type]));