From 6017a80fe8327fefb77fa677d81154db2b857d1d Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Mon, 25 Sep 2017 10:42:16 +0200 Subject: [PATCH] Fixed issue reported in #780. --- MagickCore/resample-private.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h index c824c4457..81147fefd 100644 --- a/MagickCore/resample-private.h +++ b/MagickCore/resample-private.h @@ -55,13 +55,16 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet( filter=(ResampleFilter **) AcquireQuantumMemory(number_threads, sizeof(*filter)); if (filter == (ResampleFilter **) NULL) - return((ResampleFilter **) NULL); + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(filter,0,number_threads*sizeof(*filter)); for (i=0; i < (ssize_t) number_threads; i++) { filter[i]=AcquireResampleFilter(image,exception); if (filter[i] == (ResampleFilter *) NULL) - return(DestroyResampleFilterThreadSet(filter)); + { + filter=DestroyResampleFilterThreadSet(filter); + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); + } if (method != UndefinedVirtualPixelMethod) (void) SetResampleFilterVirtualPixelMethod(filter[i],method); if (interpolate != MagickFalse) -- 2.40.0