From d27726f2b29f1588b1cd0037ca20cd365d716824 Mon Sep 17 00:00:00 2001 From: Cristy Date: Thu, 19 Jul 2018 16:05:57 -0400 Subject: [PATCH] ... --- MagickCore/draw.c | 2 +- coders/mvg.c | 19 +++++++++++++------ configure | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 23df35ba2..8884f6493 100644 --- 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 55afec6fd..53e8209d2 100644 --- 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 318325a08..9953ed8fc 100755 --- 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 -- 2.40.0