From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 2 Apr 2018 22:28:57 +0000 (-0400)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7293
X-Git-Tag: 7.0.7-29~213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31fa9d577740b83f3cde75197d01854d7bc06528;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7293
---

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 52cb1021c..0a61ce316 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -3282,7 +3282,13 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
       }
       case PathPrimitive:
       {
-        i=(ssize_t) (j+TracePath(primitive_info+j,token,exception));
+        coordinates=TracePath(primitive_info+j,token,exception);
+        if (coordinates == 0)
+          {
+            status=MagickFalse;
+            break;
+          }
+        i=(ssize_t) (j+coordinates);
         break;
       }
       case AlphaPrimitive:
@@ -6027,16 +6033,13 @@ static size_t TracePath(PrimitiveInfo *primitive_info,const char *path,
       default:
       {
         if (isalpha((int) ((unsigned char) attribute)) != 0)
-          {
-            (void) ThrowMagickException(exception,GetMagickModule(),DrawError,
-              "attribute not recognized","`%c'",attribute);
-            primitive_info->coordinates=0;
-            return(0);
-          }
+          ThrowPointExpectedException(token,exception);
         break;
       }
     }
   }
+  if (status == MagickFalse)
+    return(0);
   primitive_info->coordinates=(size_t) (q-primitive_info);
   number_coordinates+=primitive_info->coordinates;
   for (i=0; i < (ssize_t) number_coordinates; i++)