From 7c2c5ba5b8e3a0b2b82f56c71dfab74ed4006df7 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 16 Jun 2019 12:18:01 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1588 --- MagickCore/annotate.c | 3 +++ MagickCore/fourier.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 494720211..3f3ac7fa0 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -277,6 +277,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, { annotate_info=DestroyDrawInfo(annotate_info); annotate=DestroyDrawInfo(annotate); + text=DestroyString(text); return(MagickFalse); } p=text; @@ -311,6 +312,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, annotate_info=DestroyDrawInfo(annotate_info); annotate=DestroyDrawInfo(annotate); textlist=(char **) RelinquishMagickMemory(textlist); + text=DestroyString(text); return(MagickFalse); } if (IsGrayColorspace(image->colorspace) != MagickFalse) @@ -529,6 +531,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, annotate_info=DestroyDrawInfo(annotate_info); annotate=DestroyDrawInfo(annotate); textlist=(char **) RelinquishMagickMemory(textlist); + text=DestroyString(text); return(status); } diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c index f4ad2027a..9f6f19d3e 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -245,10 +245,14 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op, if (status == MagickFalse) continue; - Ar=GetCacheViewVirtualPixels(Ar_view,0,y,Ar_image->columns,1,exception); - Ai=GetCacheViewVirtualPixels(Ai_view,0,y,Ai_image->columns,1,exception); - Br=GetCacheViewVirtualPixels(Br_view,0,y,Br_image->columns,1,exception); - Bi=GetCacheViewVirtualPixels(Bi_view,0,y,Bi_image->columns,1,exception); + Ar=GetCacheViewVirtualPixels(Ar_view,0,y, + MagickMax(Ar_image->columns,Cr_image->columns),1,exception); + Ai=GetCacheViewVirtualPixels(Ai_view,0,y, + MagickMax(Ai_image->columns,Ci_image->columns),1,exception); + Br=GetCacheViewVirtualPixels(Br_view,0,y, + MagickMax(Br_image->columns,Cr_image->columns),1,exception); + Bi=GetCacheViewVirtualPixels(Bi_view,0,y, + MagickMax(Bi_image->columns,Ci_image->columns),1,exception); Cr=QueueCacheViewAuthenticPixels(Cr_view,0,y,Cr_image->columns,1,exception); Ci=QueueCacheViewAuthenticPixels(Ci_view,0,y,Ci_image->columns,1,exception); if ((Ar == (const Quantum *) NULL) || (Ai == (const Quantum *) NULL) || -- 2.40.0