Latest configure script

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 67ba54b2889e64e99f424c6eb27b7a08a02d2f68..c53ea4cb6fab6f30c7c6d1c39d25b7b86b04b0d2 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1689,6 +1689,10 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
   MagickBooleanType
     proceed;
 
+  MagickSizeType
+    length,
+    number_points;
+
   MagickStatusType
     status;
 
@@ -1718,8 +1722,6 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
 
   size_t
     extent,
-    length,
-    number_points,
     number_stops;
 
   ssize_t
@@ -2905,7 +2907,8 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
       number_points<<=1;
       primitive_info=(PrimitiveInfo *) ResizeQuantumMemory(primitive_info,
         (size_t) number_points,sizeof(*primitive_info));
-      if (primitive_info == (PrimitiveInfo *) NULL)
+      if ((primitive_info == (PrimitiveInfo *) NULL) ||
+          (number_points != (MagickSizeType) ((size_t) number_points)))
         {
           (void) ThrowMagickException(exception,GetMagickModule(),
             ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
@@ -3012,7 +3015,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
       default:
         break;
     }
-    if ((size_t) (i+length) >= number_points)
+    if ((i+length) >= number_points)
       {
         /*
           Resize based on speculative points required by primitive.
@@ -3020,7 +3023,8 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
         number_points+=length+1;
         primitive_info=(PrimitiveInfo *) ResizeQuantumMemory(primitive_info,
           (size_t) number_points,sizeof(*primitive_info));
-        if (primitive_info == (PrimitiveInfo *) NULL)
+        if ((primitive_info == (PrimitiveInfo *) NULL) ||
+            (number_points != (MagickSizeType) ((size_t) number_points)))
           {
             (void) ThrowMagickException(exception,GetMagickModule(),
               ResourceLimitError,"MemoryAllocationFailed","`%s'",

diff --git a/configure b/configure
index fd4a2c1c5686e746b4215969b9797a79c5af87fb..2f4f4a6d29b5c129e8f9debf7237b781cd77b05d 100755 (executable)
--- a/configure
+++ b/configure
@@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=9
 
 MAGICK_VERSION=7.0.1-9
 
-MAGICK_GIT_REVISION=18335:fe4eece:20160601
+MAGICK_GIT_REVISION=18338:4dbaf0e:20160601
 
 
 # Substitute library versioning