]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Sun, 22 Apr 2018 19:51:50 +0000 (15:51 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sun, 22 Apr 2018 19:51:50 +0000 (15:51 -0400)
MagickCore/draw.c
configure

index 8464538f471b10d1b0c5663e6035a800c643a606..ec347a6240ede6a7d5eb115887b4fc08ef3c31b5 100644 (file)
@@ -3357,6 +3357,11 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
             primitive_type=UndefinedPrimitive;
             break;
           }
+        if ((primitive_info[j+2].point.x < -360.0) ||
+            (primitive_info[j+2].point.x > 360.0) ||
+            (primitive_info[j+2].point.y < -360.0) ||
+            (primitive_info[j+2].point.y > 360.0))
+          ThrowPointExpectedException(token,exception);
         TraceArc(primitive_info+j,primitive_info[j].point,
           primitive_info[j+1].point,primitive_info[j+2].point);
         i=(ssize_t) (j+primitive_info[j].coordinates);
@@ -3369,6 +3374,11 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
             status=MagickFalse;
             break;
           }
+        if ((primitive_info[j+2].point.x < -360.0) ||
+            (primitive_info[j+2].point.x > 360.0) ||
+            (primitive_info[j+2].point.y < -360.0) ||
+            (primitive_info[j+2].point.y > 360.0))
+          ThrowPointExpectedException(token,exception);
         TraceEllipse(primitive_info+j,primitive_info[j].point,
           primitive_info[j+1].point,primitive_info[j+2].point);
         i=(ssize_t) (j+primitive_info[j].coordinates);
index 3754f975e80dccebd5073de31d534a71f649e956..435dd6c450db04becab73b4d8f4096ef69b19d99 100755 (executable)
--- a/configure
+++ b/configure
@@ -4554,7 +4554,7 @@ MAGICK_PATCHLEVEL_VERSION=29
 
 MAGICK_VERSION=7.0.7-29
 
-MAGICK_GIT_REVISION=14159:d7e3659e6:20180421
+MAGICK_GIT_REVISION=14173:859511c02:20180422
 
 
 # Substitute library versioning