...

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 23df35ba20e3d8a2f46cb3b18c81d6c2f2649fdb..8884f64935057bbd95f79abaed63098b82dc3e7f 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -277,7 +277,7 @@ MagickExport DrawInfo *CloneDrawInfo(const ImageInfo *image_info,
   if (draw_info == (DrawInfo *) NULL)
     return(clone_info);
   exception=AcquireExceptionInfo();
-  if (clone_info->primitive != (char *) NULL)
+  if (draw_info->primitive != (char *) NULL)
     (void) CloneString(&clone_info->primitive,draw_info->primitive);
   if (draw_info->geometry != (char *) NULL)
     (void) CloneString(&clone_info->geometry,draw_info->geometry);

diff --git a/coders/mvg.c b/coders/mvg.c
index 55afec6fdad41b7828e56c498843253513da8050..53e8209d2511d0657daf6f02656828a6d7fc4ce2 100644 (file)
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -211,13 +211,20 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
     draw_info->primitive=FileToString(image->filename,~0UL,exception);
   else
     {
-      draw_info->primitive=(char *) AcquireMagickMemory(GetBlobSize(image)+1);
-      if (draw_info->primitive != (char *) NULL)
+      MagickSizeType
+        length;
+
+      length=GetBlobSize(image);
+      if (length == (MagickSizeType) ((size_t) length))
         {
-          memcpy(draw_info->primitive,GetBlobStreamData(image),
-            GetBlobSize(image));
-          draw_info->primitive[GetBlobSize(image)]='\0';
-        }
+          draw_info->primitive=(char *) AcquireMagickMemory((size_t) length+1);
+          if (draw_info->primitive != (char *) NULL)
+            {
+              memcpy(draw_info->primitive,GetBlobStreamData(image),(size_t)
+                length);
+              draw_info->primitive[length]='\0';
+            }
+         }
      }
   if (draw_info->primitive == (char *) NULL)
     {

diff --git a/configure b/configure
index 318325a08b753ac1ef79312716a02119c5965f05..9953ed8fc1279c4bd25344ab9904d55e54cc6b4b 100755 (executable)
--- a/configure
+++ b/configure
@@ -4555,7 +4555,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.8-8
 
-MAGICK_GIT_REVISION=14562:464afd74f:20180717
+MAGICK_GIT_REVISION=14564:889476acc:20180719
 
 
 # Substitute library versioning